1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Commit graph

24728 commits

Author SHA1 Message Date
Mads Buvik Sandvei
2370364938 Update README.md 2021-01-14 19:33:56 +00:00
Mads Buvik Sandvei
37585d29bd Merge branch 'linux_gl_sys_req' into 'openmw-vr'
call xrGetOpenGLGraphicsRequirementsKHR on linux too

See merge request madsbuvi/openmw!15
2021-01-13 16:43:44 +00:00
Christoph Haag
981ed25dac call xrGetOpenGLGraphicsRequirementsKHR on linux too
This call is required per the spec.
2021-01-13 13:32:34 +01:00
Mads Buvik Sandvei
935351d9a0 Merge branch 'include_memory' into 'openxr_vr'
include <memory> for unique_ptr on gcc

See merge request madsbuvi/openmw!13

(cherry picked from commit 1d98299933344a233d532941a87a09d898d02fed)

f70b95ab include <memory> for unique_ptr on gcc
2021-01-13 11:05:21 +00:00
madsbuvi
2a593498de Save game crash. 2021-01-11 17:37:24 +01:00
madsbuvi
2b7f94aa5d GCC fixes 2021-01-10 17:26:38 +01:00
madsbuvi
eb4f393568 Include new osg dependency 2021-01-10 14:40:09 +01:00
madsbuvi
81064043f7 Bad order of setting cull flags was masking out the sky. 2021-01-10 12:24:08 +01:00
madsbuvi
1f76f93221 Fixed mirror texture blitting when back buffer is multisampled (maybe i should just force it to not be) 2021-01-09 23:39:10 +01:00
madsbuvi
61e8368e53 VR tab in the launcher. 2021-01-02 22:08:01 +01:00
madsbuvi
84bf3756be Merge remote-tracking branch 'remotes/origin/thumbstick_deadzones' into openxr_vr_geometryshader_feature_branch 2021-01-02 18:41:17 +01:00
madsbuvi
7be1b4a7da fabsf -> fabs 2021-01-02 18:40:52 +01:00
madsbuvi
43f5e6c167 Merge remote-tracking branch 'remotes/origin/thumbstick_deadzones' into openxr_vr_geometryshader_feature_branch 2021-01-02 17:41:25 +01:00
madsbuvi
6d7748ce12 Implementation 2021-01-02 17:40:37 +01:00
madsbuvi
11a3961d65 Merge remote-tracking branch 'remotes/origin/directx_swapchains' into openxr_vr_geometryshader_feature_branch 2021-01-01 19:50:52 +01:00
madsbuvi
a9cea565f9 Proper handling of cull flags 2021-01-01 11:50:18 +01:00
madsbuvi
2b43e59c09 Fixing crashes 2021-01-01 10:38:36 +01:00
madsbuvi
6ed89f9141 Support for DirectX swapchains. 2020-12-31 21:08:24 +01:00
madsbuvi
ddc30fe6f4 rethrow exceptions during openxr initialization. 2020-12-30 11:02:12 +01:00
Mads Buvik Sandvei
1c94d5af27 BruteForce fixes (still incomplete) 2020-12-20 20:32:32 +01:00
Mads Buvik Sandvei
823bda139a Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch 2020-12-20 14:17:39 +01:00
Mads Buvik Sandvei
6ab159f4d3 Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch 2020-12-19 15:56:49 +01:00
Mads Buvik Sandvei
434566ec80 Allow sharing via cv instead of camera 2020-12-19 15:55:47 +01:00
Mads Buvik Sandvei
d1faeed243 Merge remote-tracking branch 'remotes/origin/master' into shared_shadow_maps 2020-12-19 15:48:30 +01:00
Mads Buvik Sandvei
289a939d3b Sharing shadow via cv instead 2020-12-19 15:47:16 +01:00
AnyOldName3
6fa315b59e Merge branch 'madsbuvi-master-patch-39387' into 'master'
Disable MSVC warning 4866

See merge request OpenMW/openmw!480
2020-12-19 14:27:31 +00:00
Mads Buvik Sandvei
74806e4893 Better use of osg stereo, avoids redundant synchronization. 2020-12-19 15:15:58 +01:00
Mads Buvik Sandvei
637c76f438 Update CMakeLists.txt 2020-12-19 08:34:36 +00:00
Mads Buvik Sandvei
a2a462f416 Update CMakeLists.txt to disable MSVC warning 4866 2020-12-18 20:04:24 +00:00
Mads Buvik Sandvei
3e82cae500 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr_geometryshader_feature_branch 2020-12-18 20:50:58 +01:00
psi29a
a1065c8376 Merge branch 'loadingScreen_initialdrawcallback' into 'master'
Loading screen initialdrawcallback 4th time's the charm

See merge request OpenMW/openmw!479
2020-12-18 18:15:14 +00:00
Mads Buvik Sandvei
eec2ba3623 Loading screen initialdrawcallback 4th time's the charm 2020-12-18 18:15:14 +00:00
AnyOldName3
264539cd63 Merge branch 'WindowCrashCatcher' into 'master'
Handle Crashes on Windows

See merge request OpenMW/openmw!455
2020-12-18 13:41:18 +00:00
psi29a
327df7457b Merge branch 'simulationresultinactor' into 'master'
Embed physics simulation results inside of actor class.

See merge request OpenMW/openmw!478
2020-12-18 12:50:20 +00:00
fredzio
4e7c9b6696 Embed physics simulation results inside of actor class.
This gives finer control over reseting positions (switch off tcl is no
longer glitchy) and solve most of the erroneous usage of stale World::Ptr
indicated by:
"Error in frame: moveTo: object is not in this cell"
2020-12-18 12:54:02 +01:00
psi29a
d01d5745c6 Merge branch 'relative_move' into 'master'
Relative translation for scripts

See merge request OpenMW/openmw!477
2020-12-18 09:23:18 +00:00
psi29a
e586544ade Merge branch 'loadingScreen_initialdrawcallback' into 'master'
Wait for initialDrawCallback to finish before removing it

See merge request OpenMW/openmw!476
2020-12-18 08:48:39 +00:00
Mads Buvik Sandvei
ea8f98b339 Wait for initialDrawCallback to finish before removing it 2020-12-18 08:48:39 +00:00
fredzio
7bae6691b6 Introduce World::moveObjectBy() function to translate an object relatively to
its current position.
Use it in relevant MWScripts opcode (move and moveworld).
Remove the fragile detection of scripted translation from PhysicsTaskScheduler.

No user visible change, just a more robust mechanism.
2020-12-18 08:40:38 +01:00
AnyOldName3
691b4d64fe Merge branch 'nigeometry' into 'master'
Make sure NIFLoader avoids working further with empty geometry

Closes #5751

See merge request OpenMW/openmw!475
2020-12-17 23:39:37 +00:00
psi29a
96a87b582c Merge branch 'loadingScreen_initialdrawcallback' into 'master'
Fix for !472 for older versions of OSG

See merge request OpenMW/openmw!474

(cherry picked from commit 35e25d79b9a6c76807084be5ca2584c4fd9b9c35)

4447dd41 osg versions
06f4d63b Preserve callback in older osg version
2020-12-17 23:37:21 +00:00
Alexei Dobrohotov
8db2ba2b38
Merge pull request #3032 from akortunov/gtest
Mark mock methods as overrides (requires GTest 1.10)
2020-12-18 01:46:42 +03:00
Alexei Dobrohotov
46ec40fa92 Make sure NIFLoader avoids working further with empty geometry 2020-12-18 01:22:34 +03:00
AnyOldName3
70bd9d395d Merge branch 'loadingScreen_initialdrawcallback' into 'master'
Clean up use of initial draw callback in loadingscreen

See merge request OpenMW/openmw!472
2020-12-16 22:10:03 +00:00
Mads Buvik Sandvei
bc961a13f5 avoid redundant calls to removeInitialDrawCallback 2020-12-16 22:03:16 +01:00
Mads Buvik Sandvei
640420eaaa No longer delete and recreate CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just remove the callback after the traversals. Use addInitialDrawCallback instead of setInitialDrawCallback to avoid messing with existing callbacks. 2020-12-16 21:46:52 +01:00
Mads Buvik Sandvei
2f5ce823fa Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch 2020-12-16 21:02:03 +01:00
Mads Buvik Sandvei
1b193deeac Misc new stereo integration fixes. 2020-12-16 21:00:21 +01:00
Mads Buvik Sandvei
4c9278522e Misc practical fixes from integrating with vr. Reordered construction. Added more callbacks. 2020-12-16 20:59:10 +01:00
Mads Buvik Sandvei
5a25691435 Enable shader for the pointer geometry shader 2020-12-16 20:40:25 +01:00