1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-23 21:09:40 +00:00
Commit graph

1613 commits

Author SHA1 Message Date
Mads Buvik Sandvei
9c171869cb Geometry shader stereo functional 2020-09-14 22:17:07 +02:00
Andrei Kortunov
7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 2020-08-22 09:26:15 +04:00
Capostrophic
c436f29a1e Make Advanced tab of the launcher look okay for everyone again 2020-08-09 20:23:17 +03:00
Mads Buvik Sandvei
2a534877da Head/hand directed movement option 2020-08-08 12:24:24 +02:00
Mads Buvik Sandvei
89ff075936 New config options 2020-08-07 23:33:21 +02:00
Mads Buvik Sandvei
290068b871 typos 2020-08-07 22:31:11 +02:00
Petr Mikheev
6a4fa8a8b5 Add more settings to openmw-launcher 2020-08-07 20:17:44 +00:00
Mads Buvik Sandvei
b3f2373875 working commit 2020-08-06 00:54:45 +02:00
Mads Buvik Sandvei
c136ae682e SteamVR compatibility (Lack of depth formats). Cleanup of deprecated oculus workarounds in vrsession.cpp. 2020-08-02 12:34:46 +02:00
Bret Curtis
82a45eb6ae
Merge pull request #2976 from Capostrophic/unconscious
Add option to always allow stealing from KO'd actors (feature #5545)
2020-07-27 01:22:51 +02:00
Petr Mikheev
65c92b6488 Add alignment="Qt::AlignTop" to files/ui/graphicspage.ui 2020-07-27 00:24:15 +02:00
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
Bret Curtis
584fcd4716 Merge branch 'master' of github.com:OpenMW/openmw 2020-07-26 11:54:51 +02:00
Bret Curtis
224923d6c8 update appdata license and dejavufont license file 2020-07-26 01:56:55 +02:00
CedricMocquillon
1f4f10c723 Add a tab level in advanced settings 2020-07-25 17:42:31 +02:00
Mads Buvik Sandvei
9e16e592e8 steady clock prediction was not quite right 2020-07-25 12:28:52 +02:00
Mads Buvik Sandvei
1023ef6e49 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-07-22 18:56:25 +02:00
Mads Buvik Sandvei
b5675b7525 Configuration option for oculus prediction time workaround 2020-07-21 14:36:11 +02:00
Mads Buvik Sandvei
c9e761eb88 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-07-21 13:58:52 +02:00
Mads Buvik Sandvei
e0b51af395 Sharing shadow maps across eyes.
Does not yet expand frustum.
2020-07-20 13:03:48 +00:00
Petr Mikheev
2e6aa155a3 New settings 'preview if stand still' and 'deferred preview rotation'. 2020-07-19 18:21:40 +02:00
Petr Mikheev
8ac7ffc32b Remove 'separate preview camera' and make the new behavior the default one.
Also minor refactoring in camera.cpp
2020-07-17 22:59:44 +02:00
Petr Mikheev
4d206d2c67 Improved preview mode 2020-07-17 20:35:52 +02:00
Petr Mikheev
383fa3d3ab Make 'zoom out when move' configurable. 2020-07-12 21:03:18 +02:00
Petr Mikheev
ef03f2c033 Auto switch shoulder 2020-07-12 20:51:38 +02:00
Petr Mikheev
280862f58b New setting "third person camera distance" 2020-07-10 00:38:18 +02:00
psi29a
46db69a349 Merge branch 'swimming' into 'master'
Swimming-related fixes

See merge request OpenMW/openmw!247

(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)

738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
2020-07-09 20:05:59 +00:00
CedricMocquillon
998bf5da34 Add new checkbox for the new setting 'trainers training skills based on base skill' 2020-07-06 20:32:30 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills.
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
2020-07-06 20:28:08 +02:00
Mads Buvik Sandvei
166103cef5 Default settings for VR 2020-07-04 20:37:58 +02:00
Dillon
8f9de7289d fix typos 2020-07-02 13:48:56 +00:00
Alexei Dobrohotov
c53516a4b7
Merge pull request #2940 from akortunov/deadzone
Make joysticks dead zone configurable
2020-06-30 01:15:58 +03: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
Andrei Kortunov
230e06dec7 Make joysticks dead zone configurable (bug #5502) 2020-06-28 13:12:12 +04:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
Petr Mikheev
63f828fea8 Bugfix for "turn to movement direction" 2020-06-26 20:04:02 +00:00
Petr Mikheev
63137a3b5a Make vertical offset of "view over shoulder" configurable 2020-06-24 20:07:41 +02:00
psi29a
abc77075b9 Merge branch 'doc-formattopics' into 'master'
Follow up to MR 126 - make it more obvious for end users how to set colors

See merge request OpenMW/openmw!234
2020-06-24 11:26:22 +00:00
fredzio
6d4d53fc7c Add a setting to the launcher to enable/disable the dialogue topic
formatting stuff.
2020-06-22 23:21:03 +02:00
Petr Mikheev
b4c699348f Improved strafe movement 2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747 Advanced third person camera. 2020-06-22 15:22:34 +02:00
fredzio
ae27ad6bcd Follow up to MR 126
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
2020-06-22 04:31:12 +02:00
Alexei Dobrohotov
0d70318304 Merge branch 'launcher-search-datafiles-tab' into 'master'
Add a search function to the "Datafiles" tab of the OpenMW launcher

See merge request OpenMW/openmw!191
2020-06-21 14:45:31 +00:00
Cédric Mocquillon
6e397e4008 Add a search function to the "Datafiles" tab of the OpenMW launcher 2020-06-21 14:45:30 +00:00
psi29a
981184109e Merge branch 'formattopics' into 'master'
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
2020-06-21 07:58:02 +00:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix
Get rid of ECLD and dependencies
2020-06-17 15:00:57 +02:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Andrei Kortunov
50d692a097
Merge pull request #2914 from akortunov/master
Fix typos in shaders
2020-06-17 10:14:52 +04:00
Andrei Kortunov
9bc0e9b4b7 Fix typos in shaders 2020-06-17 10:13:52 +04:00
psi29a
66b5cf9f1d Merge branch 'master' into 'near_far_mode_in_launcher'
# Conflicts:
#   files/settings-default.cfg
2020-06-16 23:05:07 +00:00
psi29a
6f8eefcb16 Switching object paging active grid default option to false for now until the light limit problem is resolved. 2020-06-16 17:53:09 +00:00
psi29a
0dc7715c35 Merge branch 'object_paging_retry' into 'master'
Object Paging

See merge request OpenMW/openmw!209
2020-06-16 08:21:54 +00:00
Andrei Kortunov
f30cb9f8bc Calculate viewNormal only when needed 2020-06-15 12:57:37 +04:00
bzzt lost a hitlab login
c7fda6d280 activegrid paging = 2xfps
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4dccabeb83 fix analyzation not taking instancecount in account + settings calibration
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
77b92aee9c fix shadowsglitch by bounds overflow
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
00e56ae862 batch debug colours
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
8a624e5a71 minsize based on mergedecision solves partial culling
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ce505a9bb3 crashfix + optimiziation
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f terrainbased objectpaging
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
Capostrophic
91514aed5d Don't deliberately do redundant assignments 2020-06-09 22:08:43 +03:00
Capostrophic
1c50d25853 Minor shader fixes
Don't initialize uniform bool to false explicitly
Attempt not to calculate specular lighting if the material specular color is black
2020-06-09 15:27:38 +03: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
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
Mads Buvik Sandvei
6474d703ae GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested. 2020-05-17 16:25:51 +02:00
Mads Buvik Sandvei
6f9c405afd Tentatively completed VR GUI 2020-05-12 22:13:01 +02:00
Capostrophic
58d78fb126 Always pass the vertex color to the fragment shader 2020-05-12 18:28:07 +03:00
Capostrophic
c0b322b264 Improve color mode handling in shaders 2020-05-09 16:15:10 +03:00
psi29a
b72720f357 Merge branch 'shadow-transparency-rework' into 'master'
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
2020-05-08 21:32:16 +00:00
Bret Curtis
aaa8990006
Merge pull request #2799 from Capostrophic/simplewaterfog
Fix simple water with radial fog enabled
2020-05-08 20:48:04 +02:00
Sisah
b19f53aab6 Fix parallax and specular for android 2020-05-08 15:55:22 +02:00
fredzio
947f3cf13c Optionally change color of keywords in the dialogue window based on the
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
2020-05-02 01:42:05 +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
elsid
b150d681a9
Update same navmesh tile with limited frequency 2020-05-01 18:05:58 +02:00
Bret Curtis
5f0f2f0f16 rename to better reflect what is going on per AnyOldName3 comment; added none option 2020-05-01 00:34:31 +02:00
Bret Curtis
aca223f6c8 fix unrelated rst issue; rename to bounds 2020-04-30 17:41:26 +02:00
Bret Curtis
980525cba4 better said 2020-04-29 17:08:12 +02:00
Bret Curtis
ae729a1ac7 add ability to set the type of near far method to be used in shadow calculation; default to bounding volumes; cleaned up code while there and re-ordered items 2020-04-29 16:36:48 +02:00
Bret Curtis
3ba77b933a "compute tight scene bounds" reset back to true until it is decided how best to handle this in settings 2020-04-27 08:45:52 +02:00
bzzt
dc33eeadf1 tightscenebound is uncessary after water bbfix 2020-04-27 08:42:46 +02:00
Capostrophic
688e804548 Fix simple water with radial fog enabled 2020-04-24 13:52:53 +03:00
AnyOldName3
53b9b41159 Rely on existing alpha test for non-blended shadow casting 2020-04-21 18:18:55 +01:00
Capostrophic
bbf6b4e517 Don't radialize underwater fog 2020-04-18 12:30:59 +03:00
Capostrophic
36d82abafd Make book layer have lower priority than the layer for other GUI windows 2020-04-13 21:09:06 +03:00
AnyOldName3
12044a607b Only alpha-test shadows when necessary
Previously we always discarded shadow map fragments if the alpha channel of the output would have been low, but there were some (modded) assets that have non-one alpha but have testing or blending disabled so end up opaque anyway. This lets the shadows of those objects match.
2020-04-10 15:45:37 +01:00
Bret Curtis
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream
add launchable type
2020-04-05 10:05:20 +02:00
Andrei Kortunov
e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 2020-04-01 19:57:04 +04:00
Bret Curtis
deac2abc0f add launchable type; rename files to be conform to freedesktop.org and debian standards 2020-03-27 08:12:06 +01:00
Andrei Kortunov
9d254aefb3
Merge pull request #2731 from Capostrophic/gender
Fix Gender column filtering (bug #4601)
2020-03-23 17:27:41 +04:00
Capostrophic
18bfc6f2c5 Fix Gender column filtering (bug #4601) and correct filter descs 2020-03-22 22:09:38 +03:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
fredzio
e1b5dd97b8 Add a filter in the alchemy window.
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.

The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
2020-03-20 06:35:57 +01:00
Alexei Dobrohotov
e80fbf4786
Merge pull request #2721 from akortunov/radial_fog
Support for radial fog
2020-03-17 22:35:10 +03:00
Andrei Kortunov
02444add2a Support for radial fog (feature #4708) 2020-03-17 23:09:28 +04:00
elsid
7ae7cb181d
Support recast mesh rendering 2020-03-14 09:38:24 +01:00
Capostrophic
624a9ac353 Force shaders for objects affected by new envmap option 2020-03-04 14:06:22 +03:00
Capostrophic
2b3ecff004 Remove broken fixed function pipeline support
Added by mistake
2020-03-03 21:50:50 +03:00
Capostrophic
6999f1fd28 Add an option to apply lighting to environment maps 2020-03-03 20:08:59 +03:00
Capostrophic
19a7245251 Add bump mapping support 2020-03-03 13:32:30 +03:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00