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
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Frederic Chardon
9aba55a21a
Add the async physics worker to the profiler overlay.
2020-11-20 21:17:47 +01: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
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
Andrei Kortunov
7d776609c8
Fix unsugned/signed comparison warning
2020-09-21 10:36:01 +04:00
psi29a
22c3588d0d
Merge branch '4771-and-4631' into 'master'
...
Try lower MSAA level if the requested value isn't available
Closes #4471 and #4631
See merge request OpenMW/openmw!297
(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)
da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
2020-09-20 12:35:26 +00:00
AnyOldName3
3f61ff3a44
Make OpenGL debugging optional
2020-09-19 23:30:34 +01:00
AnyOldName3
441c09578a
Merge remote-tracking branch 'origin/khr_debug' into khr_debug
2020-09-19 23:09:11 +01:00
Mads Buvik Sandvei
c9e761eb88
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-07-21 13:58:52 +02:00
elsid
db0ad8421f
Report OSG rendering stats
2020-07-11 18:32:57 +02:00
Mads Buvik Sandvei
69b4a4741f
Formatting errors
2020-07-05 12:18:54 +02:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
...
Replace OpenThreads by std types
2020-07-04 13:11:23 +02:00
elsid
eb68df1a37
Add stats for all updates
2020-06-30 22:00:23 +02:00
Mads Buvik Sandvei
58d73e14e6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/environment.cpp
# apps/openmw/mwbase/environment.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwrender/camera.cpp
# apps/openmw/mwrender/camera.hpp
# apps/openmw/mwrender/renderingmanager.cpp
# apps/openmw/mwrender/renderingmanager.hpp
2020-06-28 11:59:07 +02:00
Mads Buvik Sandvei
519163c121
Commit before merge
2020-06-28 11:41:04 +02:00
Mads Buvik Sandvei
45656f1d06
Comments etc
2020-06-28 11:33:01 +02:00
Mads Buvik Sandvei
91de6392ca
More refactoring / cleanup. Code policies.
2020-06-26 23:02:48 +02:00
elsid
40ad87bc4d
Replace OpenThreads by std types
2020-06-25 22:16:09 +02:00
Mads Buvik Sandvei
1cf97fd7ad
lots of refactoring and some commenting
2020-06-21 23:40:07 +02:00
Mads Buvik Sandvei
9bd676f5be
Some bugfixes, more experimenting with timing of frame sync calls.
2020-06-07 20:02:03 +02:00
Mads Buvik Sandvei
f25c3af9cb
More refactoring of VRSession. Moved call of BeginFrame and WaitFrame to the start of cull to keep shadow technique within openxr specs. There is still some jitter unless i change to single-threaded, and now i have no idea why.
2020-06-03 19:46:20 +02:00
Bret Curtis
9d0855baa5
Merge pull request #2866 from elsid/extend_osg_stats
...
Extend OSG stats
2020-05-29 23:23:38 +02:00
Andrei Kortunov
dcfc4cc5dd
Rename onFrame() to update() to make WindowManager consistent with other managers
2020-05-26 18:35:16 +04: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
elsid
69df6098e5
Report frame number, number of actors and objects to stats
2020-05-22 17:39:18 +02:00
elsid
d7a920a04b
Env variable to write OSG stats into file
2020-05-18 23:44:21 +02:00
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
Andrei Kortunov
f990150c49
Move video wrapper to the WindowsManager
2020-05-09 11:27:02 +04:00
Andrei Kortunov
f9d6137a29
Do not store player reference in the InputManager
2020-05-09 11:27:02 +04:00
Bret Curtis
b8c467e2e0
Merge pull request #2787 from p4r4digm/screenshot-path
...
Added setting to change the directory screenshots are stored in
2020-05-04 17:11:49 +02:00
Mads Buvik Sandvei
57e48cfc03
Separate rendering of window menus. It's still awkward. Needs polishing.
2020-05-01 21:37:01 +02:00
Bret Curtis
8a8107e837
as it says; revert vismask and uncomplicate openmw
2020-04-20 20:57:38 +02:00
p4r4digm
0741fe5b80
removed path configuration and made screenshots just save in a folder
2020-04-20 09:22:50 -07:00
p4r4digm
2b54e6216b
Added setting to change the directory screenshots are stored in
2020-04-19 16:38:57 -07:00
Andrei Kortunov
2254256db9
Pause both audio and video playback when the game is minimized (feature #4944 )
2020-04-04 22:54:51 +04:00
Andrei Kortunov
e63325ebff
Support for camera rotation via gyroscope on Android (feature #5311 )
2020-04-01 19:57:04 +04:00
Mads Buvik Sandvei
14bb0f0208
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2020-03-30 01:37:29 +02:00
Mads Buvik Sandvei
6296f9f124
change gui render order based on vr vs non-vr
2020-03-30 01:25:23 +02:00
Mads Buvik Sandvei
893b75d767
Realistic combat, first draft
2020-03-15 15:31:38 +01:00
Mads Buvik Sandvei
de2354abda
Menu quad gets rendered, but not the menu
2020-03-01 12:54:32 +01:00
Mads Buvik Sandvei
da03e8bf41
Some refactoring
2020-02-29 23:53:56 +01:00
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
Mads Buvik Sandvei
da73df1707
Basic input management
2020-02-15 20:01:11 +01:00
Mads Buvik Sandvei
951879240c
Simplified render timing by separating rendering from the openxr swapchain, and instead blitting and submitting separately
2020-01-26 20:06:47 +01:00
Mads Buvik Sandvei
2accdc4441
Split view into worldview and menu, for ease of layer management. Basic pose management.
2020-01-24 00:14:23 +01:00
Mads Buvik Sandvei
2778775070
First commit. Wrote an osgviewer, achieved display.
2020-01-10 00:10:09 +01:00
Michael Stopa
e4bec88a68
Implement mouse wheel bindings (bug #2679 )
2019-10-30 20:45:51 +04:00
Andrei Kortunov
c51aba0b13
Recharge items outside of player's inventory (bug #4077 )
2019-10-07 22:59:43 +04:00
Andrei Kortunov
94a281370f
Continue scripts execution after player's death (bug #5166 )
2019-09-17 22:40:51 +04:00
