mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity
26,458 Commits 19 Branches 63 Tags 320 MiB
a1825980c4
Commit Graph

26458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evil Eye
a1825980c4 Define OpenMW specific C++ flags 2021-10-06 17:28:48 +02:00
Evil Eye
d680aa26e9 Disallow switch fallthrough 2021-10-03 21:58:10 +02:00
Evil Eye
686268b2f9 Remove incorrect changelog entries 2021-10-03 21:39:43 +02:00
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
 2021-10-01 21:44:42 +00:00
psi29a
2c8c36fe5d Merge branch 'master' into 'effective_magic' 
# Conflicts:
#   CHANGELOG.md
 2021-10-01 21:20:08 +00:00
psi29a
bd866cf210 Merge branch 'fix_infidelities' into 'master' 
Fix Infidelities quest from Tribunal (#6307)

Closes #6307

See merge request OpenMW/openmw!1248
 2021-10-01 21:12:15 +00:00
psi29a
1d342f80ed Merge branch 'cursorspeedmerge' into 'master' 
Updated: Change cursor speed with settings.cfg (#6312)

Closes #6312

See merge request OpenMW/openmw!1255
 2021-10-01 11:23:53 +00:00
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
 2021-10-01 11:21:06 +00:00
Bret Curtis
52a10a4bc0 remove one last assert 2021-10-01 12:24:29 +02:00
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
 2021-10-01 10:11:00 +02:00
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
 2021-10-01 08:02:17 +00:00
andrewapp
b5af192888 gamepad cursor speed fix 2021-10-01 09:19:26 +10:00
psi29a
73581af5ee Merge branch 'changelog' into 'master' 
Fix issue numbers in changelog

See merge request OpenMW/openmw!1258
 2021-09-30 21:06:46 +00:00
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. 2021-09-30 22:58:40 +02:00
Evil Eye
f6c39b9f19 Fix issue numbers 2021-09-30 22:24:25 +02:00
Frederic Chardon
5f3a36a9b7 Merge branch 'fix_crash' into 'master' 
Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer()

See merge request OpenMW/openmw!1252
 2021-09-30 07:32:21 +00:00
Petr Mikheev
24ecdc37a7 Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer() 2021-09-30 03:01:38 +02:00
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
 2021-09-29 21:24:06 +00:00
Evil Eye
2de7b8e2fb Allow non-biped creatures using weapons to open doors 2021-09-29 21:21:52 +02:00
Evil Eye
8b84822271 Merge branch 'correct-path-and-formatting' into 'master' 
Unbreak the formatting broken by !1208

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

* renderingmanager.cpp [ci skip]

* quadtreeworld.hpp

* cellborder.hpp

* cellborder.cpp
 2021-09-29 17:10:58 +02:00
Bret Curtis
803195a05f add back some explicit includes 2021-09-29 16:29:10 +02:00
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
 2021-09-29 15:40:37 +02:00
Andrei Kortunov
1109cc3ac7
Remove unused data field (#3133) 2021-09-29 12:08:51 +02:00
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
 2021-09-29 09:58:19 +02:00
Andrei Kortunov
fc2076db1a
Fix MSVC warnings about local variables redeclaration (#3130) 2021-09-29 09:36:05 +02:00
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.
 2021-09-29 01:05:23 +02:00
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.
 2021-09-29 01:05:23 +02:00
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.
 2021-09-29 01:03:24 +02:00
Petr Mikheev
eb2f863b7d Resolve unused-lambda-capture warnings 2021-09-28 13:02:45 +02:00
psi29a
5794a3b346 Merge branch 'lua_raycasting' into 'master' 
Lua raycasting

Closes #6098

See merge request OpenMW/openmw!1175
 2021-09-28 08:50:40 +00:00
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
 2021-09-28 10:17:12 +02:00
Petr Mikheev
fb3917fc1a Lua callbacks 2021-09-28 09:36:23 +02:00
Petr Mikheev
0bd1c22e24 Raycasting in Lua 2021-09-28 09:36:23 +02:00
Bret Curtis
fd251dfe55 remove unused member variable 2021-09-28 09:19:48 +02:00
Bo Svensson
5fde6867a2
removes unused code (#3129) 
* scenemanager.cpp

* scenemanager.hpp

* scenemanager.cpp

* stats.cpp

* renderingmanager.cpp
 2021-09-28 09:07:49 +02:00
Bo Svensson
d854e247b8
reword warning in settings-default.cfg (#3124) 
* reword warning in settings-default.cfg

The warning at the head of settings-default.cfg is somewhat confusing for users, overly verbose and lacking the most crucial piece of information in its first sentence. Hence, it is unsurprising some users fail to heed the warning, as observed through user support requests on Matrix.

* settings-default.cfg
 2021-09-28 08:25:12 +02:00
psi29a
89af82684c Merge branch 'stay_disabled' into 'master' 
Only add enabled objects to the scene

Closes #6302

See merge request OpenMW/openmw!1246
 2021-09-28 06:16:33 +00:00