Commit Graph

1678 Commits (39e429c9eb8c82cedffab6a6a697ab72f8b04bac)

Author SHA1 Message Date
David Cernat 39e429c9eb Add OpenMW commits up to 11 Jul 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
5 years ago
Petr Mikheev 280862f58b New setting "third person camera distance" 5 years ago
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"
5 years ago
CedricMocquillon 998bf5da34 Add new checkbox for the new setting 'trainers training skills based on base skill' 5 years ago
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'
5 years ago
David Cernat 5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
5 years ago
Dillon 8f9de7289d fix typos 5 years ago
Alexei Dobrohotov c53516a4b7
Merge pull request #2940 from akortunov/deadzone
Make joysticks dead zone configurable
5 years ago
Andrei Kortunov 230e06dec7 Make joysticks dead zone configurable (bug #5502) 5 years ago
Bret Curtis 355996c2ff supress -> suppress 5 years ago
Petr Mikheev 63f828fea8 Bugfix for "turn to movement direction" 5 years ago
Petr Mikheev 63137a3b5a Make vertical offset of "view over shoulder" configurable 5 years ago
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
5 years ago
fredzio 6d4d53fc7c Add a setting to the launcher to enable/disable the dialogue topic
formatting stuff.
5 years ago
David Cernat 3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
5 years ago
Petr Mikheev b4c699348f Improved strafe movement 5 years ago
Petr Mikheev d3bd67d747 Advanced third person camera. 5 years ago
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).
5 years ago
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
5 years ago
Cédric Mocquillon 6e397e4008 Add a search function to the "Datafiles" tab of the OpenMW launcher 5 years ago
psi29a 981184109e Merge branch 'formattopics' into 'master'
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
5 years ago
Bret Curtis c944acf26b
Merge pull request #2913 from akortunov/warnfix
Get rid of ECLD and dependencies
5 years ago
Andrei Kortunov d1a3cc98ff Get rid of ECLD and dependencies 5 years ago
Andrei Kortunov 50d692a097
Merge pull request #2914 from akortunov/master
Fix typos in shaders
5 years ago
Andrei Kortunov 9bc0e9b4b7 Fix typos in shaders 5 years ago
psi29a 66b5cf9f1d Merge branch 'master' into 'near_far_mode_in_launcher'
# Conflicts:
#   files/settings-default.cfg
5 years ago
psi29a 6f8eefcb16 Switching object paging active grid default option to false for now until the light limit problem is resolved. 5 years ago
psi29a 0dc7715c35 Merge branch 'object_paging_retry' into 'master'
Object Paging

See merge request OpenMW/openmw!209
5 years ago
Andrei Kortunov f30cb9f8bc Calculate viewNormal only when needed 5 years ago
bzzt lost a hitlab login c7fda6d280 activegrid paging = 2xfps
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt lost a hitlab login 4dccabeb83 fix analyzation not taking instancecount in account + settings calibration
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt lost a hitlab login 77b92aee9c fix shadowsglitch by bounds overflow
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt lost a hitlab login 00e56ae862 batch debug colours
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt lost a hitlab login 8a624e5a71 minsize based on mergedecision solves partial culling
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt lost a hitlab login ce505a9bb3 crashfix + optimiziation
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
bzzt d684f1a78f terrainbased objectpaging
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
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
5 years ago
Capostrophic 91514aed5d Don't deliberately do redundant assignments 5 years ago
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
5 years ago
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
5 years ago
Capostrophic 58d78fb126 Always pass the vertex color to the fragment shader 5 years ago
Capostrophic c0b322b264 Improve color mode handling in shaders 5 years ago
David Cernat 053a5a6258 Add OpenMW commits up to 9 May 2020
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
5 years ago
psi29a b72720f357 Merge branch 'shadow-transparency-rework' into 'master'
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
5 years ago
Bret Curtis aaa8990006
Merge pull request #2799 from Capostrophic/simplewaterfog
Fix simple water with radial fog enabled
5 years ago
Sisah b19f53aab6 Fix parallax and specular for android 5 years ago
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
5 years ago
elsid b150d681a9
Update same navmesh tile with limited frequency 5 years ago
Bret Curtis 5f0f2f0f16 rename to better reflect what is going on per AnyOldName3 comment; added none option 5 years ago
Bret Curtis aca223f6c8 fix unrelated rst issue; rename to bounds 5 years ago