Commit Graph

26432 Commits (f6c39b9f19ea0758427d4aaf10073daf528a928a)
 

Author SHA1 Message Date
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
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
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
Petr Mikheev fb3917fc1a Lua callbacks 3 years ago
Petr Mikheev 0bd1c22e24 Raycasting in Lua 3 years ago
Bret Curtis fd251dfe55 remove unused member variable 3 years ago
Bo Svensson 5fde6867a2
removes unused code (#3129)
* scenemanager.cpp

* scenemanager.hpp

* scenemanager.cpp

* stats.cpp

* renderingmanager.cpp
3 years ago
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
3 years ago
psi29a 89af82684c Merge branch 'stay_disabled' into 'master'
Only add enabled objects to the scene

Closes #6302

See merge request OpenMW/openmw!1246
3 years ago
Evil Eye 77a23dab09 Only add enabled objects to the scene 3 years ago
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()
3 years ago
Bret Curtis 9fabf99250 remove mDebugChunks from chunkManager 3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
psi29a 908d196fee Merge branch 'master' into 'undead_intelligence'
# Conflicts:
#   CHANGELOG.md
3 years ago
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
3 years ago
psi29a 47eda85b9f Merge branch 'master' into 'the_goal_is_elevation'
# Conflicts:
#   CHANGELOG.md
3 years ago
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
3 years ago
psi29a 449539c0ed Update CHANGELOG.md 3 years ago
psi29a ade6cd0127 Merge branch 'editor_columns_filtering' into 'master'
Toggling table columns visibility. Partially implements #890

Closes #890

See merge request OpenMW/openmw!1232
3 years ago
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
3 years ago
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
3 years ago
Evil Eye 233bb287e1 Merge branch 'refactoring2' into 'master'
Minor refactoring: use Misc::normalizeAngle in worldimp.cpp

See merge request OpenMW/openmw!1242
3 years ago
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
3 years ago
Evil Eye 34cf66139a Make GetCurrentAIPackage return -1 for non-actors and dead actors 3 years ago
Evil Eye c679565893 Make names starting with digits use normal name parsing code 3 years ago
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
3 years ago
florent.teppe 5620e8f0e2 Added the fix to the changelog, and my name to the authors 3 years ago
Petr Mikheev 83e0d9aeef Minor refactoring: use Misc::normalizeAngle in worldimp.cpp 3 years ago
psi29a aa11238be1 Merge branch 'colladaalphatest' into 'master'
Collada alpha testing

See merge request OpenMW/openmw!1177
3 years ago
psi29a e2e5161d81 Merge branch 'optimizebrushdraw' into 'master'
Optimize terrain editing brush drawing performance

Closes #6285

See merge request OpenMW/openmw!1226
3 years ago
elsid e9f253c473
Support stacked histogram for frames with duration over given threshold 3 years ago
elsid 5878b1fce6
Use same logic for testing cell as for loading cell
Having different branches makes testing less useful. If something fails in
regular executing it should fail in testing. To make it possible there should
be none differences in the execution paths.
3 years ago