1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-23 14:23:51 +00:00
Commit graph

2882 commits

Author SHA1 Message Date
madsbuvi
a0a7e6b5aa Replaced combo boxes with list box dialogues to help navigate certain elements better in VR. 2021-02-17 18:09:07 +01:00
madsbuvi
6c9df35725 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-02-01 15:09:00 +01:00
Andrei Kortunov
14cf0ce1dc Implement instanced groundcover 2021-01-26 22:29:41 +04:00
Cédric Mocquillon
3bb551a6f1 Show level multipliers in levelup tooltip 2021-01-25 10:01:39 +00:00
madsbuvi
c0772807d2 Menu transition video now visible.
Videos no longer upside down.
Scene no longer visible during loading screens.
2021-01-21 14:19:29 +01:00
madsbuvi
018e790ec0 Unite all viewer traversals. 2021-01-17 12:12:14 +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
Andrei Kortunov
a80ee7a76a Avoid possible memory leak in the mInterMessageBoxe field 2021-01-09 14:43:00 +04:00
Andrei Kortunov
8e5f26c109 Code cleanup 2021-01-09 14:41:10 +04:00
Andrei Kortunov
7fc4c9f3f6 Avoid dead code 2021-01-09 13:52:01 +04:00
madsbuvi
a9cea565f9 Proper handling of cull flags 2021-01-01 11:50:18 +01:00
Andrei Kortunov
66fee6dccb Enhance level-up tooltip 2020-12-28 12:13:09 +04:00
Evil Eye
7d8727b98e Merge branch 'books' into 'master'
Only ignore plain text after the last EOL tag (#5627)

Closes #5627

See merge request OpenMW/openmw!492
2020-12-27 14:25:57 +00:00
Evil Eye
1f1755ae48 Add version checks 2020-12-25 13:05:41 +01:00
Evil Eye
bdcbb412a5 Don't restore focus to hidden/unrelated buttons 2020-12-25 13:03:09 +01:00
Alexei Dobrohotov
fd77ef6b01 Only ignore plain text after the last EOL tag (#5627) 2020-12-23 03:33:34 +03:00
psi29a
3e87c35005 Merge branch 'dialogue' into 'master'
Don't regenerate the topics list unconditionally

See merge request OpenMW/openmw!459
2020-12-21 22:52:38 +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
Mads Buvik Sandvei
eec2ba3623 Loading screen initialdrawcallback 4th time's the charm 2020-12-18 18:15:14 +00:00
Mads Buvik Sandvei
ea8f98b339 Wait for initialDrawCallback to finish before removing it 2020-12-18 08:48:39 +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
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
1b193deeac Misc new stereo integration fixes. 2020-12-16 21:00:21 +01:00
Alexei Dobrohotov
817ac4cfbd Don't regenerate the topics list unconditionally 2020-12-12 23:07:00 +03: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
CedricMocquillon
6bfdf0e57f Add more information on mouse over level 2020-12-07 14:57:25 +01:00
Mads Buvik Sandvei
85033bb647 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-12-06 15:14:53 +01:00
Evil Eye
078de86e60 Use range based for loops and auto 2020-12-04 18:34:51 +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
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
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
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
49e76fa077 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-11-27 00:36:10 +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
Mads Buvik Sandvei
490d9e0086 Check if onOpen/onClose reversed visibility change before forwarding it to the VR GUI Manager. 2020-11-15 16:30:15 +01:00
Mads Buvik Sandvei
3e581571f4 QWERTY implementation of a virtual keyboard. 2020-11-14 19:20:36 +01:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
Mads Buvik Sandvei
c1e6b05555 Wrote a meta menu for accessibility on VR controllers with few keys. 2020-10-27 20:45:41 +01:00
Alexei Dobrohotov
9763995892 Fix regression #5666 2020-10-27 18:08:14 +03:00
Bret Curtis
5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02: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
Alexei Dobrohotov
f1b7cd5404 Don't reset temporarily hidden container window 2020-10-22 02:12:31 +03:00
Mads Buvik Sandvei
4c4fc0c69a Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera. 2020-10-21 21:34:47 +02:00
Bret Curtis
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal
Add support for service-specific refusals
2020-10-21 00:29:19 +02:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00