David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2020-06-22 20:50:55 +03: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
David Cernat
e5b1843089
Add OpenMW commits up to 11 Jun 2020
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/activespells.cpp
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/creaturestats.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2020-06-11 13:21:58 +03: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
David Cernat
62df188fd4
Add OpenMW commits up to 16 May 2020
...
# Conflicts:
# CI/before_script.linux.sh
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwscript/globalscripts.cpp
# apps/openmw/mwscript/interpretercontext.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/cellstore.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
# components/interpreter/context.hpp
2020-06-06 22:38:28 +03: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
David Cernat
053a5a6258
Add OpenMW commits up to 9 May 2020
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/aiextensions.cpp
2020-05-09 15:17:04 +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
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
David Cernat
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
2020-04-25 09:52:58 +03: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
David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
2020-04-13 19:53:42 +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
David Cernat
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
2020-04-01 19:24:11 +03: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