mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 12:53:54 +00:00
Code Issues Releases Wiki Activity
26589 commits 108 branches 66 tags 133 MiB
Commit graph

26589 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
48538d5cef 3D transforms in Lua 2021-09-28 20:37:47 +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
Evil Eye
77a23dab09 Only add enabled objects to the scene 2021-09-27 22:23:00 +02:00
Petr Mikheev
e760a6c7e6 Merge branch 'forlua' into 'master' 
Simple Physics API modification for Lua

See merge request OpenMW/openmw!1216

(cherry picked from commit d88494c90b501d0832ae0330a0ca81d8b8e5aa50)

02dd055a Save hitObject in castSphere() just like in castRay()
0793d0bf Allow to override collision mask and group for castSphere() as for castRay()
 2021-09-27 19:50:57 +00:00
Bret Curtis
9fabf99250 remove mDebugChunks from chunkManager 2021-09-27 21:38:12 +02:00
Bo Svensson
01cc61087b
improves paging preloader (#3126) 
* Return check for distance when we try to reuse data

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* cellpreloader.cpp

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.cpp

* cellpreloader.cpp

* jvoisin

* whitespace

* whitespace
 2021-09-27 21:32:18 +02:00
Bo Svensson
3f68ddd8f4
alternate debug chunks (#3127) 
* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.hpp

* quadtreeworld.hpp

* chunkmanager.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp [ci skip]

* quadtreeworld.hpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.cpp
 2021-09-27 21:25:39 +02:00
psi29a
782e0710af Merge branch 'OpenCS-preserve-blocked' into 'master' 
OpenCS - Preserve "blocked" record flags when saving. #6288

Closes #6288

See merge request OpenMW/openmw!1052
 2021-09-27 19:21:20 +00:00
psi29a
378b0eefeb Merge branch 'undead_intelligence' into 'master' 
Make GetCurrentAIPackage return -1 for non-actors and dead actors

Closes #6283

See merge request OpenMW/openmw!1221
 2021-09-27 19:12:32 +00:00
psi29a
908d196fee Merge branch 'master' into 'undead_intelligence' 
# Conflicts:
#   CHANGELOG.md
 2021-09-27 19:12:13 +00:00
psi29a
ba0f6ada71 Merge branch 'the_goal_is_elevation' into 'master' 
Make names starting with digits use normal name parsing code

Closes #6282

See merge request OpenMW/openmw!1222
 2021-09-27 19:10:48 +00:00
psi29a
47eda85b9f Merge branch 'master' into 'the_goal_is_elevation' 
# Conflicts:
#   CHANGELOG.md
 2021-09-27 19:10:33 +00:00
psi29a
c7f668457c Merge branch 'osg_stats_hist_threshold' into 'master' 
Stacked histogram for frames with duration over given threshold for osg_stats

See merge request OpenMW/openmw!1230
 2021-09-27 19:06:35 +00:00
psi29a
449539c0ed Update CHANGELOG.md 2021-09-27 19:04:38 +00:00
psi29a
ade6cd0127 Merge branch 'editor_columns_filtering' into 'master' 
Toggling table columns visibility. Partially implements #890

Closes #890

See merge request OpenMW/openmw!1232
 2021-09-27 19:02:19 +00:00
psi29a
2cee222e73 Merge branch 'explosion_at_impact' into 'master' 
Bring arrow behaviour in line with vanilla (#6233 and other change)

See merge request OpenMW/openmw!1188
 2021-09-27 19:00:53 +00:00
Bo Svensson
c6f7137ee1
fixes bugs with share state (#3111) 
* optimizer.cpp merge fix

* objectpaging.cpp

* optimizer.hpp setSharedStateManager

* optimizer.cpp shareState

* scenemanager.cpp shareState

* scenemanager.cpp

* optimizer.cpp

* optimizer.cpp

* scenemanager.cpp

* optimizer.cpp
 2021-09-27 20:41:24 +02:00
Evil Eye
233bb287e1 Merge branch 'refactoring2' into 'master' 
Minor refactoring: use Misc::normalizeAngle in worldimp.cpp

See merge request OpenMW/openmw!1242
 2021-09-27 16:01:31 +00:00
Evil Eye
30c998f34e Merge branch 'test_cells' into 'master' 
Use same logic for testing cell as for loading cell

See merge request OpenMW/openmw!1240
 2021-09-27 15:24:00 +00:00
Evil Eye
34cf66139a Make GetCurrentAIPackage return -1 for non-actors and dead actors 2021-09-26 22:15:43 +02:00
Evil Eye
c679565893 Make names starting with digits use normal name parsing code 2021-09-26 22:13:53 +02:00
Evil Eye
2f4df12b2e Merge branch 'Fix_ASCII' into 'master' 
Fixed an issue where keyword search expected the text to be all ASCII characters

See merge request OpenMW/openmw!1227
 2021-09-26 20:08:55 +00:00