Commit Graph

26464 Commits (4ce8c1e1ab4797126cf1ac59e9df9ce51ac50152)
 

Author SHA1 Message Date
Kindi 4ce8c1e1ab Update AUTHORS.md 3 years ago
Kindi 2a1cb939ba Update CHANGELOG.md 3 years ago
Kindi d9b254178f Update tradewindow.hpp
remover redundant
3 years ago
Kindi f28d6738bf Update tradewindow.cpp 3 years ago
Kindi 0c1b78c42a Update tradewindow.cpp curly 3 years ago
kuyondo 071793eeb3 Merge branch 'master' of https://gitlab.com/Kuyondo/openmw 3 years ago
kuyondo 49da33a129 comiit 3 years ago
psi29a 0e07fc38e5 Merge branch 'opencs-ui-tweaks' into 'master'
Minor UI tweaks all around OpenMW-CS

See merge request OpenMW/openmw!1212
3 years ago
Matjaž Lamut 1c9f06f742 Minor UI tweaks all around OpenMW-CS 3 years ago
psi29a 1644430bc0 Merge branch 'effective_magic' into 'master'
Overhaul magic effects

Closes #6087, #5863, #5801, #5621, #5596, #5454, #5207, #5198, #4414, #4297, and #1751

See merge request OpenMW/openmw!1116
3 years ago
psi29a 2c8c36fe5d Merge branch 'master' into 'effective_magic'
# Conflicts:
#   CHANGELOG.md
3 years ago
psi29a bd866cf210 Merge branch 'fix_infidelities' into 'master'
Fix Infidelities quest from Tribunal (#6307)

Closes #6307

See merge request OpenMW/openmw!1248
3 years ago
psi29a 1d342f80ed Merge branch 'cursorspeedmerge' into 'master'
Updated: Change cursor speed with settings.cfg (#6312)

Closes #6312

See merge request OpenMW/openmw!1255
3 years ago
psi29a f6b27f610d Merge branch 'revert_and_twist' into 'master'
Revert and restore the cell grid size with alternate fix

See merge request OpenMW/openmw!1259
3 years ago
Bret Curtis 52a10a4bc0 remove one last assert 3 years ago
Bo Svensson 2568f119a4
reapplies PR without npe (#3137)
* avoids creating empty statesets on drawables

Currently, we attempt to skip creating state on drawable nodes when this state matches the default state. This attempt is incomplete because we still create an avoidable empty stateset in the default case.

* renderingmanager.cpp

* nifloader.cpp

* nifloader.cpp

* shadervisitor.cpp
3 years ago
psi29a 9cf9da9cbd Merge branch 'fix' into 'master'
Resolve warning: lambda capture 'defaultCollisionType' is not required to be captured for this use

See merge request OpenMW/openmw!1247
3 years ago
andrewapp b5af192888 gamepad cursor speed fix 3 years ago
psi29a 73581af5ee Merge branch 'changelog' into 'master'
Fix issue numbers in changelog

See merge request OpenMW/openmw!1258
3 years ago
Bret Curtis 8309910d9d Restore the cell grid to its former non-exorbitant size, reducing stutter and also threw in a simple alternative fix for the actor position adjustment issue. 3 years ago
Evil Eye f6c39b9f19 Fix issue numbers 3 years ago
Frederic Chardon 5f3a36a9b7 Merge branch 'fix_crash' into 'master'
Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer()

See merge request OpenMW/openmw!1252
3 years ago
Petr Mikheev 24ecdc37a7 Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer() 3 years ago
Alexei Dobrohotov e24937df3b Merge branch 'opposable_thumbs' into 'master'
Allow non-biped creatures using weapons to open doors

Closes #6172

See merge request OpenMW/openmw!1251
3 years ago
Evil Eye 2de7b8e2fb Allow non-biped creatures using weapons to open doors 3 years ago
Evil Eye 8b84822271 Merge branch 'correct-path-and-formatting' into 'master'
Unbreak the formatting broken by !1208

See merge request OpenMW/openmw!1249
3 years ago
Evil Eye e4994054ec Add #5207 to the changelog 3 years ago
Evil Eye 4abcb0d7b9 Remove applied magnitude instead of min magnitude 3 years ago
Evil Eye 46ce2ff10c Add #4414 to the changelog 3 years ago
Evil Eye 63a9203dde Fix icon magnitude 3 years ago
Evil Eye 43074347e8 Prevent spell duplication 3 years ago
Evil Eye b8e4f18751 Clear temporary effects before unloading actors to prevent absorb effects becoming permanent 3 years ago
Evil Eye 161e042e2a Prevent iterator invalidation when cleaning up summons 3 years ago
Evil Eye dc1fe62dde Overhaul magic effects to work with onApply and onEnd events 3 years ago
Andrei Kortunov 5ce2eff3bd
Merge pull request #3135 from akortunov/master
Revert PR3132 due to crashes
3 years ago
Andrei Kortunov e109d86489 Revert "avoids creating empty statesets on drawables (#3132)"
This reverts commit 957c25a491.
3 years ago
Hristos N. Triantafillou bec04c6613
Unbreak the formatting broken by !1208 3 years ago
Bret Curtis b7c1d9edb0 remove unnecessary includes 3 years ago
Bo Svensson d8707a763f
fixes build (#3134)
* quadtreeworld.cpp

* renderingmanager.cpp [ci skip]

* quadtreeworld.hpp

* cellborder.hpp

* cellborder.cpp
3 years ago
Bret Curtis 803195a05f add back some explicit includes 3 years ago
Bo Svensson 8358418555
set the correct program link parameters (#3110)
* shadermanager.hpp setProgramTemplate

* shadermanager.hpp

* shadermanager.cpp setProgramTemplate

* shadervisitor.hpp setProgramTemplate

* shadervisitor.cpp setProgramTemplate

* scenemanager.cpp setProgramTemplate

* scenemanager.hpp setProgramTemplate

* renderingmanager.cpp

* groundcover.cpp setProgramTemplate

* groundcover.hpp

* groundcover.cpp

* shadervisitor.cpp

* util.cpp

* lightmanager.cpp

* scenemanager.cpp

* scenemanager.hpp

* lightmanager.cpp

* lightmanager.cpp

* lightmanager.cpp

* scenemanager.hpp [ci skip]

* water.cpp

* groundcover.cpp

* shadermanager.hpp
3 years ago
Andrei Kortunov 1109cc3ac7
Remove unused data field (#3133) 3 years ago
Bo Svensson 957c25a491
avoids creating empty statesets on drawables (#3132)
* avoids creating empty statesets on drawables

Currently, we attempt to skip creating state on drawable nodes when this state matches the default state. This attempt is incomplete because we still create an avoidable empty stateset in the default case.

* renderingmanager.cpp

* nifloader.cpp
3 years ago
Andrei Kortunov fc2076db1a
Fix MSVC warnings about local variables redeclaration (#3130) 3 years ago
elsid c0ef4417c3
Check AiTravel destination for other actors presence
Use faster aabbTest but without destance filter. To avoid dependency on a
specific constant and correctly handle situations when there is a big
difference between actors sizes.
3 years ago
elsid 9950132a5f
Allow travelling actors find path over pathgrid navmesh area type
In addition to other navmesh areas. This makes actors behaviour closer to
vanilla when pathgrid is correct.
3 years ago
elsid 163968f578
Normalize area cost factor
Recastnavigation uses path cost and heuristic based on distance to find
shortest path by A* algorithm. Using raw speed values makes cost much lower
value than heuristic (1000 times less at maximum). Heuristic is defined as
distance from node to target * 0.999 that means area cost should never be less
than 0.999 or 1 for simplicity.

Use max speed to make lowest possible cost factor equal to 1.
3 years ago
Petr Mikheev eb2f863b7d Resolve `unused-lambda-capture` warnings 3 years ago
psi29a 5794a3b346 Merge branch 'lua_raycasting' into 'master'
Lua raycasting

Closes #6098

See merge request OpenMW/openmw!1175
3 years ago
Bo Svensson e41fe7573a
avoids creating empty statesets for collada nodes (#3128)
* avoids creating empty statesets for collada nodes

With this PR we avoid creating empty statesets for collada nodes which will be detrimental to osg's draw performance.

* scenemanager.cpp
3 years ago