1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

599 commits

Author SHA1 Message Date
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
Alex Rice
e7ae7a8ca6 Allow user controller bindings 2019-08-03 19:55:58 +00:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Andrei Kortunov
57176ff8d4 Unload viewer and stop background jobs before resources unloading 2019-05-24 08:03:45 +04:00
Ilya Zhuravlev
1d02c1ef37 engine: fix window creation when SDL returns different-sized window 2019-04-30 14:25:24 -04:00
Andrei Kortunov
95d6a99c7f Do not use the CPU affinity of OSG viewer (bug #4785) 2019-04-24 14:51:00 +04:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
Andrei Kortunov
7995a92672 Initialize missing variables 2019-03-19 09:12:31 +04:00
Bret Curtis
4e3de9b00c
Merge pull request #2206 from Capostrophic/title
Loop title screen music (bug #4896)
2019-03-18 08:58:14 +01:00
elsid
4624f31788
Report navigator stats 2019-03-17 22:15:18 +03:00
Capostrophic
abae35e88b Loop title screen music (bug #4896) 2019-03-17 21:05:52 +03:00
Capostrophic
dd03d3b231 Print SDL version at startup 2019-03-15 19:07:31 +03:00
elsid
619a111a11
Run startup script once at engine start when game is running (bug #4877) 2019-02-27 22:55:13 +03:00
elsid
33f6fb258d
Option to set specific random seed for random number generator 2019-02-26 09:36:34 +03:00
Andrei Kortunov
3032b177a1 Remove redundant includes 2019-02-23 08:02:12 +04:00
Andrei Kortunov
ff9afda18d Avoid to keep reference to the local 'encoder' variable outside the Engine::go() 2019-02-17 14:29:39 +04:00
Andrei Kortunov
ab0841cc3d Split physics update from world update in the profiler 2019-01-07 14:44:43 +04:00
Andrei Kortunov
e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Andrei Kortunov
7a986f38da Support for user-defined TrueType fonts 2018-09-12 14:31:01 +04:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
Andrei Kortunov
12144de8ed Initialize missing variables 2018-08-01 20:18:37 +04:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d Use the DejaVuLGCSansMono.ttf in profilier output 2018-07-11 14:41:49 +04:00
Nikolay Kasyanov
5fcb091127 Replace FIXME with a detailed explanation of the issue 2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master"
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
2018-06-27 22:19:09 +02:00
Bret Curtis
a55583a395
Merge branch 'master' into master 2018-06-21 22:22:01 +02:00
Xenkhan
405a0caf29
Remove unneeded whitespace 2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<> 2018-06-20 13:33:59 -05:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers 2018-06-19 15:03:30 -05:00
Nikolay Kasyanov
359f87ab9f Change imageToSurface to return a unique_ptr to avoid manual surface cleanup 2018-06-16 12:12:32 +02:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595"
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595 2018-01-09 00:42:27 +00:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
Andrei Kortunov
b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 2018-01-02 14:52:42 +04:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
scrawl
36f4f0ef85 Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00