Mads Buvik Sandvei cbbc82f053 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr ... # Conflicts: # CMakeLists.txt # apps/openmw/engine.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwinput/inputmanagerimp.cpp # apps/openmw/mwinput/inputmanagerimp.hpp # apps/openmw/mwphysics/physicssystem.cpp # apps/openmw/mwrender/water.cpp # apps/openmw/mwrender/water.hpp # apps/openmw/mwworld/worldimp.cpp		2020-05-17 23:47:28 +02:00
..
.gitignore
actoranimation.cpp
actoranimation.hpp
actorspaths.cpp
actorspaths.hpp
animation.cpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
animation.hpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
bulletdebugdraw.cpp
bulletdebugdraw.hpp
camera.cpp
camera.hpp
cell.hpp
characterpreview.cpp
characterpreview.hpp
creatureanimation.cpp
creatureanimation.hpp
effectmanager.cpp
effectmanager.hpp
globalmap.cpp
globalmap.hpp
landmanager.cpp
landmanager.hpp
localmap.cpp
localmap.hpp
navmesh.cpp
navmesh.hpp
npcanimation.cpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
npcanimation.hpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
objects.cpp
objects.hpp
pathgrid.cpp
pathgrid.hpp
recastmesh.cpp
recastmesh.hpp
renderbin.hpp
renderinginterface.hpp
renderingmanager.cpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
renderingmanager.hpp	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr	2020-05-17 23:47:28 +02:00
rendermode.hpp
ripplesimulation.cpp
ripplesimulation.hpp
rotatecontroller.cpp
rotatecontroller.hpp
sky.cpp
sky.hpp
terrainstorage.cpp
terrainstorage.hpp
util.cpp
util.hpp
vismask.hpp
water.cpp
water.hpp
weaponanimation.cpp	GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested.	2020-05-17 16:25:51 +02:00
weaponanimation.hpp