39019 Commits
Author SHA1 Message Date
Alexei Kotov b47a42e5b1 Merge branch 'fix/sun-glare-horizon' into 'master'
Use strict depth test for water

Closes #8853

See merge request OpenMW/openmw!5678
2026-10-11 19:22:34 +03:00
psi29a b600ebe80f Merge branch 'osgosfix' into 'master'
bump osgos usage to support 162

See merge request OpenMW/openmw!5682
2026-10-11 12:17:32 +00:00
Bret Curtis f707a2b797 bump osgos usage to support 162 2026-10-11 14:06:14 +02:00
Alexei Kotov 45b0855c58 Merge branch 'osg-deps-version-update' into 'master'
[DEPS] Update deps version to 2026-10-10, update osg/bullet to one in deps

See merge request OpenMW/openmw!5671
2026-10-11 02:04:58 +03:00
Alexei Kotov 5cb8a029e5 Merge branch 'fix/zero-magnitude-pause' into 'master'
Show magnitude ranges before continuous effects start

Closes #9382

See merge request OpenMW/openmw!5668
2026-10-10 18:31:52 +03:00
Sarah Sunday 03252b960c [DEPS] Remove bullet date 2026-10-10 09:59:27 -05:00
blagish 0b78403e5a Use strict depth test for water 2026-10-10 16:42:35 +04:00
blagish 1966dfe218 Show ranged magnitude always 2026-10-10 13:45:26 +04:00
blagish 09c0ce51d8 Show magnitude ranges before continuous effects start 2026-10-10 13:32:03 +04:00
Evil Eye 56670e4e95 Merge branch 'vsg/295-terrain-rig-std-ownership' into 'master'
Own terrain preload views with std smart pointers

See merge request OpenMW/openmw!5672
2026-10-10 08:28:31 +00:00
psi29a 46d470004e Own terrain preload views with std smart pointers 2026-10-10 08:28:30 +00:00
Evil Eye bdadf872b9 Merge branch 'WindowUpdate' into 'master'
Fix windows update

See merge request OpenMW/openmw!5628
2026-10-10 08:26:51 +00:00
Sarah Sunday d5f0474952 [DEPS] Update deps version to 2026-10-10 2026-10-09 20:49:34 -05:00
Alexei Kotov 336ca84463 Merge branch 'prewindupsmoothtransition' into 'master'
Enable smooth pitch transition for ranged release

See merge request OpenMW/openmw!5669
2026-10-10 00:41:53 +03:00
Sarah Sunday 308615538d [BULLET] Set fetchcontent to pull 3.25 2026-10-08 19:09:46 -05:00
Cole Green 920e75f474 Merge branch 'levitation_standing_on' into 'master'
Flying actors don't trigger "standing on" effects

Closes #9257

See merge request OpenMW/openmw!5616
2026-10-08 10:27:59 -05:00
Cole Green 0270f5c76c Merge branch 'weatherwhether' into 'master'
Use normalized paths in weather manager

See merge request OpenMW/openmw!5656
2026-10-08 10:24:25 -05:00
nox7 fdabb21877 Bump Lua revision 162 -> 163 2026-10-08 10:23:29 -05:00
Sarah Sunday 07e1a2ad3d [DEPS] Update deps version, update osg commit to one in deps 2026-10-08 09:37:24 -05:00
Alexei Kotov 9f3fb2d239 Enable smooth pitch transition for ranged release 2026-10-08 02:42:51 +03:00
Alexei Kotov a882697616 Merge branch 'cursor-binding-override' into 'master'
Fix Lua cursor API preventing mouse-bound actions when in engine gui mode

See merge request OpenMW/openmw!5653
2026-10-07 17:17:20 +03:00
Alexei Kotov b2871d6809 Merge branch 'vsg/260-physics-debugdraw-inject' into 'master'
Hand the physics debug drawer in as a btIDebugDraw

See merge request OpenMW/openmw!5661
2026-10-07 16:58:44 +03:00
Alexei Kotov ed88ccbdad Merge branch 'vsg/270-input-screenshot-callback' into 'master'
Hand the screenshot action to input as a callback

See merge request OpenMW/openmw!5663
2026-10-07 16:41:57 +03:00
Alexei Kotov 2f0688aa59 Merge branch 'coverity-657163-move-blendrules' into 'master'
Move blend rules into the anim source instead of copying

See merge request OpenMW/openmw!5664
2026-10-07 15:27:26 +03:00
AnyOldName3 0c6a724f33 Merge branch 'clever-derogatory' into 'master'
Don't defer configuring the global openmw.cfg until install time

See merge request OpenMW/openmw!5662
2026-10-07 00:19:26 +00:00
AnyOldName3 738fe85392 Don't install extra copy of OSG plugins on MacOS
We don't do runtime dependency sets there yet.
2026-10-06 23:17:42 +01:00
Bret Curtis 4ee088ac9e Move blend rules into the anim source instead of copying
The local shared_ptr is dead after the assignment, so moving it saves a refcount increment/decrement pair per animation source load. Flagged by Coverity as COPY_INSTEAD_OF_MOVE.
2026-10-06 10:29:48 +02:00
Bret Curtis 1b31e9c947 Hand the physics debug drawer in as a btIDebugDraw
PhysicsSystem took the scene root only to build MWRender::DebugDrawer itself, which pulled osg and the renderer into mwphysics. World now builds the drawer and passes it in as a plain btIDebugDraw; the per-frame redraw goes through Bullet's own clearLines/debugDrawWorld/flushLines, and collision markers through drawContactPoint, so mwphysics no longer includes anything from mwrender and the drawer no longer needs the collision world. clearLines arrived in Bullet 2.87, so the system Bullet minimum moves from 2.86 to 2.87, and the dead Travis/AppVeyor 2.83 override goes with it.
2026-10-06 09:38:09 +02:00
AnyOldName3 85d4590140 Use GNUInstallDirs_get_absolute_install_dir 2026-10-06 02:14:35 +01:00
AnyOldName3 2b911e00a7 Misc tidying 2026-10-06 01:37:29 +01:00
Bret Curtis 04f0804712 Return the save thumbnail from World as encoded JPEG
MWBase::World::screenshot took an osg::Image for the caller to fill, and StateManager then encoded it to JPEG through osgDB itself. The encoding now happens in RenderingManager next to the capture, and World hands back the JPEG bytes, so MWBase::World loses its osg::Image parameter and mwstate no longer touches OSG.
2026-10-06 00:33:16 +02:00
AnyOldName3 2efda6ca82 Don't defer configuring the global openmw.cfg until install time
In modern CMake, CMAKE_INSTALL_PREFIX during install time is interpreted like DESTDIR, so anything installed with --prefix must end up moved before it's run, and CMAKE_INSTALL_PREFIX at configure-time must match the real runtime prefix.

That means that my clever (in the derogatory sense) solution to parameterise the global openmw.cfg based on the install-time value of CMAKE_INSTALL_PREFIX didn't do anything useful, but it did have the potential to confuse packagers, and also broke Fedora packaging because that relies on the special-case prefix magic to stop things ending up in /usr/etc, and I'd bypassed that.
2026-10-05 23:13:00 +01:00
Bret Curtis 18a2fa9b02 Hand the screenshot action to input as a callback
ActionManager held the osgViewer viewer and ScreenCaptureHandler only to trigger a capture on the screenshot key. The engine now passes a std::function that does the capture, so ActionManager has no OSG left and InputManager no longer needs ScreenCaptureHandler; the viewer still goes through to SDLUtil::InputWrapper.
2026-10-06 00:10:03 +02:00
AnyOldName3 71fc0a4a29 Merge branch 'cmake-rework-phase-2' into 'master'
CMake rework phase 2

See merge request OpenMW/openmw!5657
2026-10-05 21:50:28 +00:00
psi29a a6a5a95cac Merge branch 'vsg/230-non-scene-caches-shared-ptr' into 'master'
Cache animation data as std::shared_ptr, dropping their osg::Object base

See merge request OpenMW/openmw!5622
2026-10-05 16:57:14 +00:00
Bret Curtis e8f6c25d1a Cache animation data as std::shared_ptr, dropping their osg::Object base
SceneUtil::KeyframeHolder and SceneUtil::AnimBlendRules are pure data — a
map of keyframe controllers and a vector of blend rules. Nothing attaches
them to a scene graph; both classes existed as osg::Object only because
the cache stored them via osg::ref_ptr. With the value-type seam from the
previous MR in place, they can be plain classes cached as
std::shared_ptr<const T>, and the TemplateRef pins in AnimBlendRulesManager
become an aliasing shared_ptr that keeps the cached base and override rules
alive while merged rules are in use.
2026-10-05 17:36:58 +02:00
Cole Green 3e1a1b7f3e Merge branch 'element-order' into 'master'
Make ui.getElements return elements in their rendered order

Closes #9356

See merge request OpenMW/openmw!5627
2026-10-05 10:15:37 -05:00
Cole Green 2c1f6f31ee Lua API version bump 162 -> 163 2026-10-05 10:14:59 -05:00
nox7 9ab678c385 Remove use of redundant vector 2026-10-05 10:14:03 -05:00
nox7 39c7def396 Document that ui.getElements now returns elements in rendered order when on an overlapping MyGUI layer 2026-10-05 10:14:03 -05:00
nox7 c24c21e9fd Return elements in known rendering order 2026-10-05 10:14:03 -05:00
Alexei Kotov b8412d8ed1 Merge branch 'namelessScriptIndex' into 'master'
Fix index increment with nameless script variables

Closes #9372

See merge request OpenMW/openmw!5655
2026-10-05 17:29:45 +03:00
Alexei Kotov 0f850c8b99 Merge branch 'fix/nif-saved-particles-first-frame' into 'master'
Apply particle affectors to saved particles on load

See merge request OpenMW/openmw!5652
2026-10-05 17:20:52 +03:00
AnyOldName3 7ca3f9959c RUNTIME_DEPENDENCY_SET requires 3.21 2026-10-05 01:43:27 +01:00
xxorza b2798333d0 Update nifloader.cpp 2026-10-05 03:31:44 +03:00
AnyOldName3 054b021709 Forgot some indentation when find-and-replacing 2026-10-04 22:47:29 +01:00
AnyOldName3 0348863dd2 Functions allow code deduplication. Who knew? 2026-10-04 22:15:08 +01:00
AnyOldName3 0925ff8de2 Don't redundantly re-find OSG plugins on MacOS 2026-10-04 22:09:35 +01:00
AnyOldName3 c2ad153f48 Tidy up OPENMW_DEPLOY_RUNTIME_DEPENDENCIES vs OPENMW_LOCAL_INSTALL 2026-10-04 21:43:27 +01:00
AnyOldName3 01b53d5916 Include licence etc. in package 2026-10-04 18:59:14 +01:00