From 57c40bc0520fcb34a6b6267e5efe61d3b667dbd5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 3 May 2025 16:26:39 +0200
Subject: [PATCH 01/21] Don't trigger cell change logic when the player isn't
 changing cells

---
 apps/openmw/mwlua/objectbindings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 6575a719f6..fc994532df 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -100,7 +100,8 @@ namespace MWLua
             stats.land(true);
             stats.setTeleported(true);
             world->getPlayer().setTeleported(true);
-            world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false);
+            bool differentCell = ptr.getCell() != destCell;
+            world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false, differentCell);
             MWWorld::Ptr newPtr = world->getPlayerPtr();
             world->moveObject(newPtr, pos);
             world->rotateObject(newPtr, rot);

From 9756d3d84fae3b05fafc1d9a8c0f864602984484 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 11 May 2025 13:38:39 +0200
Subject: [PATCH 02/21] Update can be used column

---
 .../lua-scripting/tables/aux_packages.rst     |  3 +-
 .../lua-scripting/tables/packages.rst         | 65 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/docs/source/reference/lua-scripting/tables/aux_packages.rst b/docs/source/reference/lua-scripting/tables/aux_packages.rst
index 928e5821de..d0217ce202 100644
--- a/docs/source/reference/lua-scripting/tables/aux_packages.rst
+++ b/docs/source/reference/lua-scripting/tables/aux_packages.rst
@@ -7,5 +7,6 @@
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.ui <Package openmw_aux.ui>`             | by player scripts  | | User interface utils                                        |
+|:ref:`openmw_aux.ui <Package openmw_aux.ui>`             | by player and menu | | User interface utils                                        |
+|                                                         | scripts            |                                                               |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/docs/source/reference/lua-scripting/tables/packages.rst b/docs/source/reference/lua-scripting/tables/packages.rst
index fd82608aed..d0aa32abea 100644
--- a/docs/source/reference/lua-scripting/tables/packages.rst
+++ b/docs/source/reference/lua-scripting/tables/packages.rst
@@ -1,43 +1,48 @@
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 | Package                                                    | Can be used        | Description                                                   |
 +============================================================+====================+===============================================================+
-|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                                                            |                    | | that don't depend on the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
-|                                                            |                    | | between game sessions.                                      |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
+|:ref:`openmw.ambient <Package openmw.ambient>`              | by player and menu | | Controls background sounds for given player.                |
+|                                                            | scripts            |                                                               |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.animation <Package openmw.animation>`          | everywhere         | | Animation controls                                          |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers and callbacks.                                       |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.vfs <Package openmw.vfs>`                      | everywhere         | | Read-only access to data directories via VFS.               |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.markup <Package openmw.markup>`                | everywhere         | | API to work with markup languages.                          |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ambient <Package openmw.ambient>`              | by player scripts  | | Controls background sounds for given player.                |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input.                                                 |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.menu <Package openmw.menu>`                    | by menu scripts    | | Main menu functionality, such as managing game saves        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera.                                            |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
+|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.debug <Package openmw.debug>`                  | by player scripts  | | Collection of debug utils.                                  |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`                  | by player and menu | | User input.                                                 |
+|                                                            | scripts            |                                                               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.markup <Package openmw.markup>`                | everywhere         | | API to work with markup languages.                          |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.menu <Package openmw.menu>`                    | by menu scripts    | | Main menu functionality, such as managing game saves        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby <Package openmw.nearby>`                | by local and       | | Read-only access to the nearest area of the game world.     |
+|                                                            | player scripts     |                                                               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self <Package openmw.self>`                    | by local and       | | Full access to the object the script is attached to.        |
+|                                                            | player scripts     |                                                               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                            |                    | | between game sessions.                                      |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui <Package openmw.ui>`                        | by player and menu | | Controls :ref:`user interface <User interface reference>`.  |
+|                                                            | scripts            |                                                               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                            |                    | | that don't depend on the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.vfs <Package openmw.vfs>`                      | everywhere         | | Read-only access to data directories via VFS.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+

From 54eea09a9e3d741ccd024ca00b81ee05590a8834 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 15 May 2025 21:01:14 +0300
Subject: [PATCH 03/21] Fix out-of-bounds index dataChanged calls

---
 components/contentselector/model/contentmodel.cpp | 8 ++++----
 components/contentselector/model/contentmodel.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 5f0d41d38c..06fed147c6 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -726,7 +726,7 @@ void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileL
             }
         }
     }
-    emit dataChanged(index(0, 0), index(rowCount(), columnCount()));
+    refreshModel();
 }
 
 QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::checkForLoadOrderErrors(
@@ -790,9 +790,9 @@ QString ContentSelectorModel::ContentModel::toolTip(const EsmFile* file) const
     }
 }
 
-void ContentSelectorModel::ContentModel::refreshModel()
+void ContentSelectorModel::ContentModel::refreshModel(std::initializer_list<int> roles)
 {
-    emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
+    emit dataChanged(index(0, 0), index(rowCount() - 1, 0), roles);
 }
 
 bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath, bool checkState)
@@ -878,5 +878,5 @@ ContentSelectorModel::ContentFileList ContentSelectorModel::ContentModel::checke
 void ContentSelectorModel::ContentModel::uncheckAll()
 {
     mCheckedFiles.clear();
-    emit dataChanged(index(0, 0), index(rowCount(), columnCount()), { Qt::CheckStateRole, Qt::UserRole + 1 });
+    refreshModel({ Qt::CheckStateRole, Qt::UserRole + 1 });
 }
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 3eba939125..492168d66c 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -67,7 +67,7 @@ namespace ContentSelectorModel
         ContentFileList checkedItems() const;
         void uncheckAll();
 
-        void refreshModel();
+        void refreshModel(std::initializer_list<int> roles = {});
 
     private:
         void addFile(EsmFile* file);

From 89d6408587210b00afaa48eb32c958f5920012b6 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 15 May 2025 23:00:08 +0300
Subject: [PATCH 04/21] Avoid unnecessary file system access in plugin toggling

---
 components/contentselector/model/contentmodel.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 5f0d41d38c..81095db196 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -835,10 +835,7 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath,
     {
         for (const EsmFile* downstreamFile : mFiles)
         {
-            QFileInfo fileInfo(filepath);
-            QString filename = fileInfo.fileName();
-
-            if (downstreamFile->gameFiles().contains(filename, Qt::CaseInsensitive))
+            if (downstreamFile->gameFiles().contains(file->fileName(), Qt::CaseInsensitive))
             {
                 mCheckedFiles.erase(downstreamFile);
 

From f7f56655884ffe943b4a53c39a28eb3013fc85f7 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 15 May 2025 21:55:19 +0300
Subject: [PATCH 05/21] Avoid repeated item(QString) in plugin toggling-related
 code

---
 .../contentselector/model/contentmodel.cpp      | 17 ++++++-----------
 .../contentselector/model/contentmodel.hpp      |  2 +-
 .../contentselector/view/contentselector.cpp    |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 81095db196..9280b6f9c0 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -278,7 +278,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const
 
             if (success)
             {
-                success = setCheckState(file->filePath(), value.toBool());
+                success = setCheckState(file, value.toBool());
                 emit dataChanged(index, index);
             }
         }
@@ -305,7 +305,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const
 
             if (setState)
             {
-                setCheckState(file->filePath(), success);
+                setCheckState(file, success);
                 emit dataChanged(index, index);
             }
             else
@@ -710,11 +710,11 @@ void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileL
     int previousPosition = -1;
     for (const QString& filepath : fileList)
     {
-        if (setCheckState(filepath, true))
+        const EsmFile* file = item(filepath);
+        if (setCheckState(file, true))
         {
             // setCheckState already gracefully handles builtIn and fromAnotherConfigFile
             // as necessary, move plug-ins in visible list to match sequence of supplied filelist
-            const EsmFile* file = item(filepath);
             int filePosition = indexFromItem(file).row();
             if (filePosition < previousPosition)
             {
@@ -795,13 +795,8 @@ void ContentSelectorModel::ContentModel::refreshModel()
     emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
 }
 
-bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath, bool checkState)
+bool ContentSelectorModel::ContentModel::setCheckState(const EsmFile* file, bool checkState)
 {
-    if (filepath.isEmpty())
-        return false;
-
-    const EsmFile* file = item(filepath);
-
     if (!file || file->builtIn() || file->fromAnotherConfigFile())
         return false;
 
@@ -810,7 +805,7 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath,
     else
         mCheckedFiles.erase(file);
 
-    emit dataChanged(indexFromItem(item(filepath)), indexFromItem(item(filepath)));
+    emit dataChanged(indexFromItem(file), indexFromItem(file));
 
     if (file->isGameFile())
         refreshModel();
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 3eba939125..19b2e6cceb 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -59,7 +59,7 @@ namespace ContentSelectorModel
         void setCurrentGameFile(const EsmFile* file);
 
         bool isEnabled(const QModelIndex& index) const;
-        bool setCheckState(const QString& filepath, bool isChecked);
+        bool setCheckState(const EsmFile* file, bool isChecked);
         bool isNew(const QString& filepath) const;
         void setNew(const QString& filepath, bool isChecked);
         void setNonUserContent(const QStringList& fileList);
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 0be6e7c023..42851e1e21 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -156,7 +156,7 @@ void ContentSelectorView::ContentSelector::setGameFile(const QString& filename)
         index = ui->gameFileView->findText(file->fileName());
 
         // verify that the current index is also checked in the model
-        if (!mContentModel->setCheckState(filename, true))
+        if (!mContentModel->setCheckState(file, true))
         {
             // throw error in case file not found?
             return;

From b006cb9846bbe8924f60b7b6d3b834086dc77722 Mon Sep 17 00:00:00 2001
From: Dave Corley <corleycomputerrepair@protonmail.ch>
Date: Sat, 17 May 2025 07:04:23 -0700
Subject: [PATCH 06/21] FIX: Correctly describe interface availability of menu
 scripts

---
 docs/source/reference/lua-scripting/tables/interfaces.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/lua-scripting/tables/interfaces.rst b/docs/source/reference/lua-scripting/tables/interfaces.rst
index 944a483dda..d8dfffe47d 100644
--- a/docs/source/reference/lua-scripting/tables/interfaces.rst
+++ b/docs/source/reference/lua-scripting/tables/interfaces.rst
@@ -34,10 +34,10 @@
     - | Control, extend, and override skill progression of the 
       | player.
   * - :ref:`Settings <Interface Settings>`
-    - by player and global scripts
+    - by player, menu, and global scripts
     - Save, display and track changes of setting values.
   * - :ref:`MWUI <Interface MWUI>`
-    - by player scripts
+    - by player and menu scripts
     - Morrowind-style UI templates.
   * - :ref:`UI <Interface UI>`
     - by player scripts

From 47fff7f99837f020fbe8f12bfeb7ef81b1fe279b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 19 May 2025 15:06:19 +0100
Subject: [PATCH 07/21] Disable shadows even harder

On GPUs that can detect when all fragments in an execution group take the same branch, this might run faster. Even if it doesn't, it might suppress any weirdness coming from sampling the dummy shadow maps.
---
 components/sceneutil/shadow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 1d5e5d6209..a03700578d 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -104,6 +104,8 @@ namespace SceneUtil
                 ("shadowTexture" + std::to_string(i - mShadowSettings->getBaseShadowTextureUnit())).c_str(),
                 static_cast<int>(i)));
         }
+        stateset.addUniform(new osg::Uniform("maximumShadowMapDistance", 0.00001f));
+        stateset.addUniform(new osg::Uniform("shadowFadeStart", 0.0f));
     }
 
     ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,

From 2c6d11f95e6f2e29e68bfbefe6163aa338905b10 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 17 May 2025 19:02:51 +0300
Subject: [PATCH 08/21] Make the horrifying content model flags() game search
 less horrifying

Properly exit early and cache game file check result
---
 .../contentselector/model/contentmodel.cpp    | 37 +++++++------------
 components/contentselector/model/esmfile.cpp  | 10 ++---
 components/contentselector/model/esmfile.hpp  |  1 +
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 4309850f2d..30bfeffe6e 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -116,37 +116,26 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index
     if (file == mGameFile)
         return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
 
-    Qt::ItemFlags returnFlags;
+    // files with no dependencies can always be checked
+    if (file->gameFiles().empty())
+        return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
 
-    // addon can be checked if its gamefile is
-    // ... special case, addon with no dependency can be used with any gamefile.
-    bool gamefileChecked = false;
-    bool noGameFiles = true;
-    for (const QString& fileName : file->gameFiles())
+    // Show the file if the game it is for is enabled.
+    // NB: The file may theoretically depend on multiple games.
+    // Early exit means that a file is visible only if its earliest found game dependency is enabled.
+    // This can be counterintuitive, but it is okay for non-bizarre content setups. And also faster.
+    for (const EsmFile* depFile : mFiles)
     {
-        for (QListIterator<EsmFile*> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next())
+        if (depFile->isGameFile() && file->gameFiles().contains(depFile->fileName(), Qt::CaseInsensitive))
         {
-            // compare filenames only.  Multiple instances
-            // of the filename (with different paths) is not relevant here.
-            EsmFile* depFile = dependencyIter.peekNext();
-            if (!depFile->isGameFile() || depFile->fileName().compare(fileName, Qt::CaseInsensitive) != 0)
-                continue;
-
-            noGameFiles = false;
-            if (depFile->builtIn() || depFile->fromAnotherConfigFile() || mCheckedFiles.contains(depFile))
-            {
-                gamefileChecked = true;
+            if (!depFile->builtIn() && !depFile->fromAnotherConfigFile() && !mCheckedFiles.contains(depFile))
                 break;
-            }
+
+            return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
         }
     }
 
-    if (gamefileChecked || noGameFiles)
-    {
-        returnFlags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
-    }
-
-    return returnFlags;
+    return Qt::NoItemFlags;
 }
 
 QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int role) const
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index 02ac0efa70..c9df0a39e9 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -2,13 +2,15 @@
 
 ContentSelectorModel::EsmFile::EsmFile(const QString& fileName, ModelItem* parent)
     : ModelItem(parent)
-    , mFileName(fileName)
 {
+    setFileName(fileName);
 }
 
 void ContentSelectorModel::EsmFile::setFileName(const QString& fileName)
 {
     mFileName = fileName;
+    mHasGameExtension = (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)
+        || mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
 }
 
 void ContentSelectorModel::EsmFile::setAuthor(const QString& author)
@@ -53,9 +55,7 @@ void ContentSelectorModel::EsmFile::setFromAnotherConfigFile(bool fromAnotherCon
 
 bool ContentSelectorModel::EsmFile::isGameFile() const
 {
-    return (mGameFiles.size() == 0)
-        && (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)
-            || mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
+    return mHasGameExtension && mGameFiles.empty();
 }
 
 QVariant ContentSelectorModel::EsmFile::fileProperty(const FileProperty prop) const
@@ -108,7 +108,7 @@ void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, con
     switch (prop)
     {
         case FileProperty_FileName:
-            mFileName = value;
+            setFileName(value);
             break;
 
         case FileProperty_Author:
diff --git a/components/contentselector/model/esmfile.hpp b/components/contentselector/model/esmfile.hpp
index d040dbd04d..505deb45d6 100644
--- a/components/contentselector/model/esmfile.hpp
+++ b/components/contentselector/model/esmfile.hpp
@@ -102,6 +102,7 @@ namespace ContentSelectorModel
         QString mToolTip;
         bool mBuiltIn = false;
         bool mFromAnotherConfigFile = false;
+        bool mHasGameExtension = false;
     };
 }
 

From 30da6dc50832bb0172d084be0178286d9ae92013 Mon Sep 17 00:00:00 2001
From: Kuyondo <Kindi@DESKTOP-7D8MM3O>
Date: Thu, 22 May 2025 00:34:33 +0800
Subject: [PATCH 09/21] allow activateBy to trigger handlers

---
 apps/openmw/mwlua/objectbindings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index fc994532df..3508fdcd44 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -351,8 +351,8 @@ namespace MWLua
                     throw std::runtime_error(
                         "The argument of `activateBy` must be an actor who activates the object. Got: "
                         + actor.toString());
-                if (objPtr.getRefData().activate())
-                    MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
+
+                MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
             };
 
             auto isEnabled = [](const ObjectT& o) { return o.ptr().getRefData().isEnabled(); };

From b7a7936dd66be52d55bdb0668bd79e545731cedc Mon Sep 17 00:00:00 2001
From: Kuyondo <Kindi@DESKTOP-7D8MM3O>
Date: Thu, 22 May 2025 02:49:45 +0800
Subject: [PATCH 10/21] api revision 73 to 74

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c84e06c86..708cebef6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 73)
+set(OPENMW_LUA_API_REVISION 74)
 set(OPENMW_POSTPROCESSING_API_REVISION 2)
 
 set(OPENMW_VERSION_COMMITHASH "")

From 0fc22b2b2de8d643577095b11717de12036974d7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 May 2025 17:19:50 +0200
Subject: [PATCH 11/21] Check selected files existence in the reload cells
 thread

This reduces UI reponse time.
---
 apps/launcher/datafilespage.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index f5c0694a3b..9f92e8ed0f 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1001,7 +1001,11 @@ bool Launcher::DataFilesPage::showDeleteMessageBox(const QString& text)
 
 void Launcher::DataFilesPage::slotAddonDataChanged()
 {
-    QStringList selectedFiles = selectedFilePaths();
+    const ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
+    QStringList selectedFiles;
+    for (const ContentSelectorModel::EsmFile* item : items)
+        selectedFiles.append(item->filePath());
+
     if (mSelectedFiles != selectedFiles)
     {
         const std::lock_guard lock(mReloadCellsMutex);
@@ -1013,6 +1017,7 @@ void Launcher::DataFilesPage::slotAddonDataChanged()
 
 void Launcher::DataFilesPage::reloadCells()
 {
+    QStringList selectedFiles;
     std::unique_lock lock(mReloadCellsMutex);
 
     while (true)
@@ -1025,16 +1030,26 @@ void Launcher::DataFilesPage::reloadCells()
         if (!std::exchange(mReloadCells, false))
             continue;
 
-        QStringList selectedFiles = mSelectedFiles;
+        const QStringList newSelectedFiles = mSelectedFiles;
 
         lock.unlock();
 
-        CellNameLoader cellNameLoader;
-        QSet<QString> set = cellNameLoader.getCellNames(selectedFiles);
-        QStringList cellNamesList(set.begin(), set.end());
-        std::sort(cellNamesList.begin(), cellNamesList.end());
+        QStringList filteredFiles;
+        for (const QString& v : newSelectedFiles)
+            if (QFile::exists(v))
+                filteredFiles.append(v);
 
-        emit signalLoadedCellsChanged(std::move(cellNamesList));
+        if (selectedFiles != filteredFiles)
+        {
+            selectedFiles = std::move(filteredFiles);
+
+            CellNameLoader cellNameLoader;
+            QSet<QString> set = cellNameLoader.getCellNames(selectedFiles);
+            QStringList cellNamesList(set.begin(), set.end());
+            std::sort(cellNamesList.begin(), cellNamesList.end());
+
+            emit signalLoadedCellsChanged(std::move(cellNamesList));
+        }
 
         lock.lock();
 

From 9387f50f778bd5153e492d846fc3190d24f58719 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 22 May 2025 04:53:34 +0300
Subject: [PATCH 12/21] Allow equip attach/detach keys to coincide with the
 start key

---
 apps/openmw/mwmechanics/character.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d13f3c9926..87cc469eb4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1388,6 +1388,7 @@ namespace MWMechanics
                     // Note: we do not disable unequipping animation automatically to avoid body desync
                     weapgroup = getWeaponAnimation(mWeaponType);
                     int unequipMask = MWRender::BlendMask_All;
+                    mUpperBodyState = UpperBodyState::Unequipping;
                     bool useShieldAnims = mAnimation->useShieldAnimations();
                     if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell
                         && !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell))
@@ -1402,7 +1403,6 @@ namespace MWMechanics
                     mAnimation->disable(weapgroup);
                     playBlendedAnimation(
                         weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0);
-                    mUpperBodyState = UpperBodyState::Unequipping;
 
                     mAnimation->detachArrow();
 
@@ -1447,6 +1447,7 @@ namespace MWMechanics
                         {
                             mAnimation->showWeapons(false);
                             int equipMask = MWRender::BlendMask_All;
+                            mUpperBodyState = UpperBodyState::Equipping;
                             if (useShieldAnims && weaptype != ESM::Weapon::Spell)
                             {
                                 equipMask = equipMask | ~MWRender::BlendMask_LeftArm;
@@ -1459,7 +1460,6 @@ namespace MWMechanics
                                 playBlendedAnimation(weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start",
                                     "equip stop", 0.0f, 0);
                             }
-                            mUpperBodyState = UpperBodyState::Equipping;
 
                             // If we do not have the "equip attach" key, show weapon manually.
                             if (weaptype != ESM::Weapon::Spell

From 3955428f879da38934f84678c3d72eabaac9e7db Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 17 May 2025 13:46:06 +0200
Subject: [PATCH 13/21] Show progress dialog on updating content selection

---
 .../contentselector/view/contentselector.cpp  | 23 ++++++++++++-------
 .../contentselector/view/contentselector.hpp  |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 42851e1e21..f8374b5db5 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -7,6 +7,7 @@
 #include <QClipboard>
 #include <QMenu>
 #include <QModelIndex>
+#include <QProgressDialog>
 #include <QSortFilterProxyModel>
 
 ContentSelectorView::ContentSelector::ContentSelector(QWidget* parent, bool showOMWScripts)
@@ -292,27 +293,33 @@ void ContentSelectorView::ContentSelector::slotShowContextMenu(const QPoint& pos
     mContextMenu->exec(globalPos);
 }
 
-void ContentSelectorView::ContentSelector::setCheckStateForMultiSelectedItems(bool checked)
+void ContentSelectorView::ContentSelector::setCheckStateForMultiSelectedItems(Qt::CheckState checkState)
 {
-    Qt::CheckState checkState = checked ? Qt::Checked : Qt::Unchecked;
-    for (const QModelIndex& index : ui->addonView->selectionModel()->selectedIndexes())
+    const QModelIndexList selectedIndexes = ui->addonView->selectionModel()->selectedIndexes();
+
+    QProgressDialog progressDialog("Updating content selection", {}, 0, static_cast<int>(selectedIndexes.size()));
+    progressDialog.setWindowModality(Qt::WindowModal);
+    progressDialog.setValue(0);
+
+    for (qsizetype i = 0, n = selectedIndexes.size(); i < n; ++i)
     {
-        QModelIndex sourceIndex = mAddonProxyModel->mapToSource(index);
+        const QModelIndex sourceIndex = mAddonProxyModel->mapToSource(selectedIndexes[i]);
+
         if (mContentModel->data(sourceIndex, Qt::CheckStateRole).toInt() != checkState)
-        {
             mContentModel->setData(sourceIndex, checkState, Qt::CheckStateRole);
-        }
+
+        progressDialog.setValue(static_cast<int>(i + 1));
     }
 }
 
 void ContentSelectorView::ContentSelector::slotUncheckMultiSelectedItems()
 {
-    setCheckStateForMultiSelectedItems(false);
+    setCheckStateForMultiSelectedItems(Qt::Unchecked);
 }
 
 void ContentSelectorView::ContentSelector::slotCheckMultiSelectedItems()
 {
-    setCheckStateForMultiSelectedItems(true);
+    setCheckStateForMultiSelectedItems(Qt::Checked);
 }
 
 void ContentSelectorView::ContentSelector::slotCopySelectedItemsPaths()
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index 2fdd38c799..fde2d063c1 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -69,7 +69,7 @@ namespace ContentSelectorView
         void buildAddonView();
         void buildContextMenu();
         void setGameFileSelected(int index, bool selected);
-        void setCheckStateForMultiSelectedItems(bool checked);
+        void setCheckStateForMultiSelectedItems(Qt::CheckState checkState);
 
     signals:
         void signalCurrentGamefileIndexChanged(int);

From 157e8c763c10a24cfb24fe5b738ddcf6faa3c3a8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 21 May 2025 22:07:17 +0200
Subject: [PATCH 14/21] Show progress dialog for setting content list

---
 components/contentselector/model/contentmodel.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 4309850f2d..6f5772986e 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -13,6 +13,7 @@
 #include <QDirIterator>
 #include <QFont>
 #include <QIODevice>
+#include <QProgressDialog>
 
 #include <components/esm/format.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -707,10 +708,14 @@ bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile* file) c
 
 void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileList)
 {
+    QProgressDialog progressDialog("Setting content list", {}, 0, static_cast<int>(fileList.size()));
+    progressDialog.setWindowModality(Qt::WindowModal);
+    progressDialog.setValue(0);
+
     int previousPosition = -1;
-    for (const QString& filepath : fileList)
+    for (qsizetype i = 0, n = fileList.size(); i < n; ++i)
     {
-        const EsmFile* file = item(filepath);
+        const EsmFile* file = item(fileList[i]);
         if (setCheckState(file, true))
         {
             // setCheckState already gracefully handles builtIn and fromAnotherConfigFile
@@ -725,7 +730,10 @@ void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileL
                 previousPosition = filePosition;
             }
         }
+
+        progressDialog.setValue(static_cast<int>(i + 1));
     }
+
     refreshModel();
 }
 

From 5cf8191cead81b85981821b03244d809b7da2e36 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 22 May 2025 17:31:33 +0200
Subject: [PATCH 15/21] Fix compilation on MSVC

---
 components/terrain/terraingrid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 2849c4d401..88fcaf667d 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -95,7 +95,7 @@ namespace Terrain
         if (!terrainNode)
             return; // no terrain defined
 
-        TerrainGrid::World::loadCell(x, y);
+        Terrain::World::loadCell(x, y);
 
         mTerrainRoot->addChild(terrainNode);
 

From fa3e8ea74d5a8ada3678996f9e32d2deb8941e61 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 24 May 2025 17:58:16 +0200
Subject: [PATCH 16/21] Prevent conflicts between UI layer insertions

---
 apps/openmw/mwlua/uibindings.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 677a51a887..33380b8ea3 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -160,26 +160,31 @@ namespace MWLua
             else
                 return LuaUtil::toLuaIndex(index);
         };
-        layersTable["insertAfter"] = [context](
-                                         std::string_view afterName, std::string_view name, const sol::object& opt) {
+        layersTable["insertAfter"] = [context](std::string afterName, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
-            size_t index = LuaUi::Layer::indexOf(afterName);
-            if (index == LuaUi::Layer::count())
-                throw std::logic_error(std::string("Layer not found"));
-            index++;
             context.mLuaManager->addAction(
-                [=, name = std::string(name)]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
+                [=]() {
+                    size_t index = LuaUi::Layer::indexOf(afterName);
+                    if (index == LuaUi::Layer::count())
+                        throw std::logic_error(
+                            Misc::StringUtils::format("Couldn't insert after non-existent layer %s", afterName));
+                    LuaUi::Layer::insert(index + 1, name, options);
+                },
+                "Insert after UI layer");
         };
-        layersTable["insertBefore"] = [context](
-                                          std::string_view beforename, std::string_view name, const sol::object& opt) {
+        layersTable["insertBefore"] = [context](std::string beforeName, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
-            size_t index = LuaUi::Layer::indexOf(beforename);
-            if (index == LuaUi::Layer::count())
-                throw std::logic_error(std::string("Layer not found"));
             context.mLuaManager->addAction(
-                [=, name = std::string(name)]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
+                [=]() {
+                    size_t index = LuaUi::Layer::indexOf(beforeName);
+                    if (index == LuaUi::Layer::count())
+                        throw std::logic_error(
+                            Misc::StringUtils::format("Couldn't insert before non-existent layer %s", beforeName));
+                    LuaUi::Layer::insert(index - 1, name, options);
+                },
+                "Insert before UI layer");
         };
         sol::table layers = LuaUtil::makeReadOnly(layersTable);
         sol::table layersMeta = layers[sol::metatable_key];

From b7b6a41aecf46fce03205e650571986074eda6bc Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 24 May 2025 19:38:29 +0200
Subject: [PATCH 17/21] Bump API revision

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 708cebef6b..e153fce677 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 74)
+set(OPENMW_LUA_API_REVISION 75)
 set(OPENMW_POSTPROCESSING_API_REVISION 2)
 
 set(OPENMW_VERSION_COMMITHASH "")

From d2f1eeff981892348de8f1c4a30505a93d950c01 Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Mon, 26 May 2025 01:22:10 -0600
Subject: [PATCH 18/21] Prevent hard freeze when camera receives invalid inputs
 from Lua

---
 CHANGELOG.md                         |  1 +
 apps/openmw/mwlua/camerabindings.cpp | 26 +++++++++-------
 components/misc/finitenumbers.hpp    | 45 ++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 components/misc/finitenumbers.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7429aa2ddd..4117e86054 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -234,6 +234,7 @@
     Bug #8445: Launcher crashes on exit when cell name loading thread is still running
     Bug #8462: Crashes when resizing the window on macOS
     Bug #8465: Blue screen w/ antialiasing and post-processing on macOS
+    Bug #8503: Camera does not handle NaN gracefully
     Feature #1415: Infinite fall failsafe
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index d64110ea98..345ca9af65 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -2,6 +2,7 @@
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
+#include <components/misc/finitenumbers.hpp>
 #include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -11,11 +12,12 @@
 
 namespace MWLua
 {
-
     using CameraMode = MWRender::Camera::Mode;
 
     sol::table initCameraPackage(sol::state_view lua)
     {
+        using FiniteFloat = Misc::FiniteFloat;
+
         MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera();
         MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();
 
@@ -49,26 +51,27 @@ namespace MWLua
         api["getRoll"] = [camera]() { return -camera->getRoll(); };
 
         api["setStaticPosition"] = [camera](const osg::Vec3f& pos) { camera->setStaticPosition(pos); };
-        api["setPitch"] = [camera](float v) {
+        api["setPitch"] = [camera](const FiniteFloat v) {
             camera->setPitch(-v, true);
             if (camera->getMode() == CameraMode::ThirdPerson)
                 camera->calculateDeferredRotation();
         };
-        api["setYaw"] = [camera](float v) {
+        api["setYaw"] = [camera](const FiniteFloat v) {
             camera->setYaw(-v, true);
             if (camera->getMode() == CameraMode::ThirdPerson)
                 camera->calculateDeferredRotation();
         };
-        api["setRoll"] = [camera](float v) { camera->setRoll(-v); };
-        api["setExtraPitch"] = [camera](float v) { camera->setExtraPitch(-v); };
-        api["setExtraYaw"] = [camera](float v) { camera->setExtraYaw(-v); };
-        api["setExtraRoll"] = [camera](float v) { camera->setExtraRoll(-v); };
+        api["setRoll"] = [camera](const FiniteFloat v) { camera->setRoll(-v); };
+        api["setExtraPitch"] = [camera](const FiniteFloat v) { camera->setExtraPitch(-v); };
+        api["setExtraYaw"] = [camera](const FiniteFloat v) { camera->setExtraYaw(-v); };
+        api["setExtraRoll"] = [camera](const FiniteFloat v) { camera->setExtraRoll(-v); };
         api["getExtraPitch"] = [camera]() { return -camera->getExtraPitch(); };
         api["getExtraYaw"] = [camera]() { return -camera->getExtraYaw(); };
         api["getExtraRoll"] = [camera]() { return -camera->getExtraRoll(); };
 
         api["getThirdPersonDistance"] = [camera]() { return camera->getCameraDistance(); };
-        api["setPreferredThirdPersonDistance"] = [camera](float v) { camera->setPreferredCameraDistance(v); };
+        api["setPreferredThirdPersonDistance"]
+            = [camera](const FiniteFloat v) { camera->setPreferredCameraDistance(v); };
 
         api["getFirstPersonOffset"] = [camera]() { return camera->getFirstPersonOffset(); };
         api["setFirstPersonOffset"] = [camera](const osg::Vec3f& v) { camera->setFirstPersonOffset(v); };
@@ -76,7 +79,7 @@ namespace MWLua
         api["getFocalPreferredOffset"] = [camera]() -> osg::Vec2f { return camera->getFocalPointTargetOffset(); };
         api["setFocalPreferredOffset"] = [camera](const osg::Vec2f& v) { camera->setFocalPointTargetOffset(v); };
         api["getFocalTransitionSpeed"] = [camera]() { return camera->getFocalPointTransitionSpeed(); };
-        api["setFocalTransitionSpeed"] = [camera](float v) { camera->setFocalPointTransitionSpeed(v); };
+        api["setFocalTransitionSpeed"] = [camera](const FiniteFloat v) { camera->setFocalPointTransitionSpeed(v); };
         api["instantTransition"] = [camera]() { camera->instantTransition(); };
 
         api["getCollisionType"] = [camera]() { return camera->getCollisionType(); };
@@ -86,11 +89,12 @@ namespace MWLua
         api["getFieldOfView"]
             = [renderingManager]() { return osg::DegreesToRadians(renderingManager->getFieldOfView()); };
         api["setFieldOfView"]
-            = [renderingManager](float v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
+            = [renderingManager](const FiniteFloat v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
 
         api["getBaseViewDistance"] = [] { return Settings::camera().mViewingDistance.get(); };
         api["getViewDistance"] = [renderingManager]() { return renderingManager->getViewDistance(); };
-        api["setViewDistance"] = [renderingManager](float d) { renderingManager->setViewDistance(d, true); };
+        api["setViewDistance"]
+            = [renderingManager](const FiniteFloat d) { renderingManager->setViewDistance(d, true); };
 
         api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{ camera->getViewMatrix() }; };
 
diff --git a/components/misc/finitenumbers.hpp b/components/misc/finitenumbers.hpp
new file mode 100644
index 0000000000..3d166ee26d
--- /dev/null
+++ b/components/misc/finitenumbers.hpp
@@ -0,0 +1,45 @@
+#ifndef OPENMW_COMPONENTS_MISC_FINITENUMBERS_HPP
+#define OPENMW_COMPONENTS_MISC_FINITENUMBERS_HPP
+
+#include <components/lua/luastate.hpp>
+
+#include <cmath>
+#include <stdexcept>
+
+namespace Misc
+{
+    struct FiniteFloat
+    {
+        float mValue;
+        FiniteFloat(float v)
+        {
+            if (!std::isfinite(v))
+                throw std::invalid_argument("Value must be a finite number");
+            mValue = v;
+        }
+        operator float() const { return mValue; }
+    };
+}
+
+namespace sol
+{
+    using FiniteFloat = Misc::FiniteFloat;
+
+    template <typename Handler>
+    bool sol_lua_check(
+        sol::types<FiniteFloat>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking)
+    {
+        bool success = sol::stack::check<float>(L, lua_absindex(L, index), handler);
+        tracking.use(1);
+        return success;
+    }
+
+    static FiniteFloat sol_lua_get(sol::types<FiniteFloat>, lua_State* L, int index, sol::stack::record& tracking)
+    {
+        float val = sol::stack::get<float>(L, lua_absindex(L, index));
+        tracking.use(1);
+        return FiniteFloat(val);
+    }
+}
+
+#endif

From 32169155bb92d8f1c4386237c4363055b2fa1430 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 27 May 2025 11:56:16 +0000
Subject: [PATCH 19/21] Fix before insert index

---
 apps/openmw/mwlua/uibindings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 33380b8ea3..bc5581eb74 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -182,7 +182,7 @@ namespace MWLua
                     if (index == LuaUi::Layer::count())
                         throw std::logic_error(
                             Misc::StringUtils::format("Couldn't insert before non-existent layer %s", beforeName));
-                    LuaUi::Layer::insert(index - 1, name, options);
+                    LuaUi::Layer::insert(index, name, options);
                 },
                 "Insert before UI layer");
         };

From f7a33d24e2fc7b48476699c7e14b0ba58ab3f606 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 26 May 2025 02:52:11 +0300
Subject: [PATCH 20/21] Uncursify forward/reverse console search (#8532)

Correct search start/end calculation, give normal search the memo that the end iterator's meaning changed and fix broken invalid range guards.
---
 apps/openmw/mwgui/console.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index a188f3c86b..a94736baee 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -465,7 +465,6 @@ namespace MWGui
 
     void Console::findOccurrence(const SearchDirection direction)
     {
-
         if (mCurrentSearchTerm.empty())
         {
             return;
@@ -478,17 +477,16 @@ namespace MWGui
         size_t firstIndex{ 0 };
         size_t lastIndex{ historyText.length() };
 
-        // If search is not the first adjust the range based on the direction and previous occurrence.
+        // If this isn't the first search, adjust the range based on the previous occurrence.
         if (mCurrentOccurrenceIndex != std::string::npos)
         {
-            if (direction == SearchDirection::Forward && mCurrentOccurrenceIndex > 1)
+            if (direction == SearchDirection::Forward)
             {
                 firstIndex = mCurrentOccurrenceIndex + mCurrentOccurrenceLength;
             }
-            else if (direction == SearchDirection::Reverse
-                && (historyText.length() - mCurrentOccurrenceIndex) > mCurrentOccurrenceLength)
+            else if (direction == SearchDirection::Reverse)
             {
-                lastIndex = mCurrentOccurrenceIndex - 1;
+                lastIndex = mCurrentOccurrenceIndex;
             }
         }
 
@@ -523,6 +521,13 @@ namespace MWGui
     void Console::findInHistoryText(const std::string& historyText, const SearchDirection direction,
         const size_t firstIndex, const size_t lastIndex)
     {
+        if (lastIndex <= firstIndex)
+        {
+            mCurrentOccurrenceIndex = std::string::npos;
+            mCurrentOccurrenceLength = 0;
+            return;
+        }
+
         if (mRegExSearch)
         {
             findWithRegex(historyText, direction, firstIndex, lastIndex);
@@ -570,7 +575,7 @@ namespace MWGui
         const size_t firstIndex, const size_t lastIndex)
     {
         // Search in given text interval for search term
-        const size_t substringLength{ (lastIndex - firstIndex) + 1 };
+        const size_t substringLength = lastIndex - firstIndex;
         const std::string_view historyTextView((historyText.c_str() + firstIndex), substringLength);
         if (direction == SearchDirection::Forward)
         {

From e7976a544a158c2063e3f83955c327829d3a3147 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 29 May 2025 00:53:17 +0300
Subject: [PATCH 21/21] Increment some new Qt progress bars the canonical way

---
 apps/launcher/datafilespage.cpp    | 9 +++++----
 components/config/gamesettings.cpp | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 9f92e8ed0f..ce9891a818 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -365,15 +365,15 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
     QIcon containsDataIcon(":/images/openmw-plugin.png");
 
-    QProgressDialog progressBar("Adding data directories", {}, 0, directories.count(), this);
+    QProgressDialog progressBar("Adding data directories", {}, 0, static_cast<int>(directories.size()), this);
     progressBar.setWindowModality(Qt::WindowModal);
-    progressBar.setValue(0);
 
     std::unordered_set<QString> visitedDirectories;
-    for (const Config::SettingValue& currentDir : directories)
+    for (qsizetype i = 0; i < directories.size(); ++i)
     {
-        progressBar.setValue(progressBar.value() + 1);
+        progressBar.setValue(static_cast<int>(i));
 
+        const Config::SettingValue& currentDir = directories.at(i);
         if (!visitedDirectories.insert(currentDir.value).second)
             continue;
 
@@ -436,6 +436,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
         }
         item->setToolTip(tooltip.join('\n'));
     }
+    progressBar.setValue(progressBar.maximum());
     mSelector->sortFiles();
 
     QList<Config::SettingValue> selectedArchives = mGameSettings.getArchiveList();
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 36373f8f35..b70fe2db4b 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -38,19 +38,19 @@ void Config::GameSettings::validatePaths()
 
     mDataDirs.clear();
 
-    QProgressDialog progressBar("Validating paths", {}, 0, paths.count() + 1);
+    QProgressDialog progressBar("Validating paths", {}, 0, static_cast<int>(paths.size() + 1));
     progressBar.setWindowModality(Qt::WindowModal);
     progressBar.setValue(0);
 
     for (const auto& dataDir : paths)
     {
-        progressBar.setValue(progressBar.value() + 1);
         if (QDir(dataDir.value).exists())
         {
             SettingValue copy = dataDir;
             copy.value = QDir(dataDir.value).canonicalPath();
             mDataDirs.append(copy);
         }
+        progressBar.setValue(progressBar.value() + 1);
     }
 
     // Do the same for data-local