madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-01 15:09:00 +01:00
Bret Curtis
b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
...
Grass instancing
2021-01-27 12:21:24 +01:00
Frederic Chardon
7cd7fa2f08
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
...
a valid file.
2021-01-27 08:04:33 +00:00
Andrei Kortunov
f40e227686
Remove redundant formatting changes
2021-01-26 22:29:41 +04:00
Andrei Kortunov
14cf0ce1dc
Implement instanced groundcover
2021-01-26 22:29:41 +04:00
madsbuvi
018e790ec0
Unite all viewer traversals.
2021-01-17 12:12:14 +01:00
psi29a
654238fd18
Merge branch 'no_bonus_points' into 'master'
...
Show mesh origin
Closes #5771
See merge request OpenMW/openmw!507
2021-01-11 21:21:47 +00:00
madsbuvi
81064043f7
Bad order of setting cull flags was masking out the sky.
2021-01-10 12:24:08 +01:00
Mads Buvik Sandvei
a2d8a0b61a
engine.cpp typos
2021-01-09 14:44:15 +00: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
unknown
3bf641d3ce
Show mesh origin
2020-12-29 21:45:59 +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
74806e4893
Better use of osg stereo, avoids redundant synchronization.
2020-12-19 15:15:58 +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
d03f55bc2d
Basic functions in place. Still bad handling of GUI
2020-12-11 18:37:50 +01:00
Mads Buvik Sandvei
76fc1a8f84
Stereo now initializes before anything is drawn. Added option to add initial/pre/post draw callbacks to stereo.
2020-12-10 21:29:56 +01:00
Mads Buvik Sandvei
d3d81a98e5
Make VRGUI use shaders
2020-12-10 21:28:20 +01:00
Mads Buvik Sandvei
b98b4db4c1
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-09 21:11:53 +01:00
Mads Buvik Sandvei
c974e1dde3
Merge remote tracking branch multiview_test_branch
2020-12-09 19:42:15 +01:00
Mads Buvik Sandvei
5beb0bc799
Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch
2020-12-08 20:50:27 +01:00
Evil Eye
e62fff5f2e
Add a setting to disable graphical herbalism
2020-12-07 19:04:32 +01:00
Mads Buvik Sandvei
c870749c39
Merge remote-tracking branch 'remotes/origin/master' into multiview_test_branch
2020-12-06 15:24:12 +01:00
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
e42dada208
Load interaction profile suggestions from xml instead of hardcoding them.
2020-12-02 21:49:00 +01:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04: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
Mads Buvik Sandvei
70e8e818b6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into multiview_test_branch
2020-10-08 19:28:51 +02:00
Mads Buvik Sandvei
189fc51811
ref_ptr > unique_ptr
2020-10-08 18:46:52 +02: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
2952463112
Configurability. Brute force option.
2020-09-19 20:55:06 +02:00
Mads Buvik Sandvei
9c171869cb
Geometry shader stereo functional
2020-09-14 22:17:07 +02: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
