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

16934 commits

Author SHA1 Message Date
Mads Buvik Sandvei
85033bb647 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-12-06 15:14:53 +01:00
Mads Buvik Sandvei
5148f4ecb0 Fix use of deallocated data. 2020-12-06 12:05:07 +01:00
Mads Buvik Sandvei
c11d6a48e4 Improved logic for selecting swapchain formats, and listed more options.
SteamVR and Oculus will now both choose rgba
2020-12-06 12:03:34 +01:00
Petr Mikheev
5734551ff3 Add time to logs. Redirect OSG log to OpenMW log. 2020-12-05 13:46:02 +01:00
Mads Buvik Sandvei
3008062955 Added the quick keys menu to the meta menu and added the option to assign it to your controller if you wish. 2020-12-04 22:41:49 +01:00
Mads Buvik Sandvei
c46c20dec2 Corrected base character height. 2020-12-04 22:41:06 +01:00
fredzio
5a4872393a Rework actor position reset. While solving the issue with invalid
position being used under heavy load, I introduced a regression that
prevented the position to be updated in case of teleport.
Move the logic in its own function and decide in PhysicsSystem whether a
reset is needed.
2020-12-03 12:57:57 +01:00
psi29a
6f0b90e606 documented that currently underwater shadows are mutually exclusive to refraction scale; to be fixed in follow up issue #5709; documentation fixes 2020-12-02 23:03:10 +00:00
Mads Buvik Sandvei
d34ff613b3 Less verbose debug statement 2020-12-02 21:49:47 +01:00
Mads Buvik Sandvei
e42dada208 Load interaction profile suggestions from xml instead of hardcoding them. 2020-12-02 21:49:00 +01:00
Mads Buvik Sandvei
c3418a45ae Fix crash introduced by yesterday's changes 2020-12-02 17:55:52 +01:00
Mads Buvik Sandvei
be29bf04af some clang warnings 2020-12-01 22:28:31 +01:00
Mads Buvik Sandvei
e22e691167 picky gcc 2020-12-01 22:26:12 +01:00
Mads Buvik Sandvei
b710fa5a75 Another attempt at fixing the pipelines via mygui3.2 compatibility. This time by injecting inheritance of layers to inject the setPick function. 2020-12-01 21:36:46 +01:00
Mads Buvik Sandvei
6c0a02d2c3 Fixed thumbstick not releasing properly in GUI mode. I forgot to inject key release 2020-11-30 23:07:07 +01:00
Mads Buvik Sandvei
f7ceee7a5e Revert "Drop MyGUI 3.4 requirement. Manage layer and widget focus manually."
This reverts commit 259330ab14.
2020-11-30 22:52:56 +01:00
Nelsson Huotari
b0e3bd6ff9 Fix crash caused by QStatusBar 2020-11-29 23:25:34 +02:00
Mads Buvik Sandvei
74a91c4e33 Another WMR workaround 2020-11-29 19:08:32 +01:00
Mads Buvik Sandvei
2c4f1534fa Merge branch 'openxr_vr_mmr' into 'openxr_vr'
Possible MMR controller workaround

See merge request madsbuvi/openmw!12
2020-11-29 18:02:42 +00:00
Mads Buvik Sandvei
aff7d93a21 This is why i wanted MyGUI 3.4. So many hacks to use 3.2. 2020-11-29 19:02:06 +01:00
Mads Buvik Sandvei
1e64aea1a5 Bump openxr to version 1.0.13. Interaction profiles for vive cosmos and huawei 2020-11-29 17:15:53 +01:00
Mads Buvik Sandvei
e8b0198eaa Possible MMR controller workaround 2020-11-29 16:29:57 +01:00
Bret Curtis
16b34c2863
Merge pull request #3029 from akortunov/replace_zeroes
Replace zeroes and nulls by nullptrs
2020-11-29 14:50:01 +01:00
psi29a
73ca333c4b Merge branch 'actorpositionagain' into 'master'
Make the physics simulation more robust when overloaded

See merge request OpenMW/openmw!429
2020-11-29 13:48:35 +00:00
Mads Buvik Sandvei
e56d74518d VR tab in the settings menu. 2020-11-29 13:14:00 +01:00
Andrei Kortunov
8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
fredzio
ea2ba27084 Move the moment when the actor origin is saved before simulation so to
be sure the simulation is over. Otherwise, if the simulation is too slow
the position is wrong, and the actors would jump back and forth between
old and new position instead of actually moving.
2020-11-28 21:36:45 +01:00
Mads Buvik Sandvei
211de4d3b2 Fix fog color not applying to VR cameras. 2020-11-28 19:50:47 +01:00
Mads Buvik Sandvei
fde3ae1403 wrist option 2020-11-28 19:41:09 +01:00
Mads Buvik Sandvei
fde6cc231e Hud alongside arm instead of across to avoid getting eaten by shields 2020-11-28 18:58:23 +01:00
psi29a
dc1bd8ec29 Merge branch 'osgAnimation_basics' into 'master'
Collada animation support

See merge request OpenMW/openmw!421
2020-11-28 16:55:26 +00:00
Mads Buvik Sandvei
2a5e552fd0 Openxr vr clang fixes 2020-11-28 11:22:21 +00:00
Mads Buvik Sandvei
01add8023e derp fix 2020-11-28 00:25:34 +01:00
Mads Buvik Sandvei
04711180bd Continue use of ifdef pragmas until i feel like cleaning up build rules 2020-11-27 23:08:08 +01:00
Mads Buvik Sandvei
259330ab14 Drop MyGUI 3.4 requirement. Manage layer and widget focus manually. 2020-11-27 21:47:20 +01:00
Mads Buvik Sandvei
02c7e8ed2a Merge branch 'openxr_vr' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-11-27 00:36:22 +01:00
Mads Buvik Sandvei
49e76fa077 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-11-27 00:36:10 +01:00
Mads Buvik Sandvei
349bee3138 Fix for issue #50, doors not working when object paging active grid is enabled 2020-11-27 00:33:31 +01:00
psi29a
96e22bd44e Merge branch 'fastforwardpos' into 'master'
Discard physics simulation results after fast forward

See merge request OpenMW/openmw!423

(cherry picked from commit ff2d7695698341ef059c75707aa092cef48deea4)

03a37433 In case of time fast forward (resting, jail), force reset of positions
2020-11-23 20:15:44 +00:00
Mads Buvik Sandvei
acdce6e0d0 Refactored OpenXRSwapchainImpl to use two private objects that instantiate a swapchain, instead of instantiating two swapchains directly. Added handling of runtime failures in xrAcquireSwapchain(), xrWaitSwapchain(), and xrReleaseSwapchain(). 2020-11-22 15:23:11 +01:00
AnyOldName3
f8c791fde3 Merge branch 'physics_worker_profile' into 'master'
Add the async physics worker to the profiler overlay.

See merge request OpenMW/openmw!422
2020-11-21 00:18:44 +00:00
Frederic Chardon
9aba55a21a Add the async physics worker to the profiler overlay. 2020-11-20 21:17:47 +01:00
jefetienne
bc6f46465f Add to changelog, authors. Move variable declaration inside block 2020-11-19 10:34:15 -05:00
jefetienne
2413de38b5 Extend spell/item search to search by magic effect name 2020-11-19 10:34:15 -05:00
Nelsson Huotari
6e77ad1f6a OSG-Collada animation support 2020-11-19 01:11:56 +02:00
Nelsson Huotari
f78a5d795c Separate keyframes logic to provide basis for osgAnimation integration. 2020-11-18 22:48:47 +02:00
psi29a
c69b407f8c Merge branch 'close_the_window_before_you_destroy_the_world' into 'master'
Don't unload the world before closing containers

Closes #5689

See merge request OpenMW/openmw!419
2020-11-18 18:19:46 +00:00
Evil Eye
c126d8801f Fix #5689 2020-11-18 17:28:09 +01:00
AnyOldName3
06d1e70aac Make Bullet DebugDrawer's default state match the physics system 2020-11-18 15:34:21 +00:00
uramer
ce455e7aaa Nicer VR meta menu 2020-11-17 23:20:32 +01:00