From d19839a66670f4410ebf97e7dcd42f1c89300114 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 25 Oct 2017 21:55:58 +0200
Subject: [PATCH 01/27] standerdise on 3.1.0

---
 CMakeLists.txt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47678e7d..f4b912c70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,16 +24,8 @@ if (USE_QT)
     set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
 endif()
 
-if (APPLE)
-    # OS X build process relies on this fix: https://github.com/Kitware/CMake/commit/3df5147043d83aa09acd5c9ce31d5c602efb99db
-    cmake_minimum_required(VERSION 3.1.0)
-elseif (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
-    # 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
-    cmake_minimum_required(VERSION 2.8.11)
-else()
-    # We probably support older versions than this.
-    cmake_minimum_required(VERSION 2.6)
-endif()
+# set the minimum required version across the board
+cmake_minimum_required(VERSION 3.1.0)
 
 project(OpenMW)
 

From f9c396e0eae7037d0217b79cbbb5fe3878853a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.com>
Date: Sat, 28 Oct 2017 15:48:07 +0200
Subject: [PATCH 02/27] stop landing animation when turning

---
 apps/openmw/mwmechanics/character.cpp | 6 ++++++
 apps/openmw/mwmechanics/character.hpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 03acfdaf2..dc910c577 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -372,6 +372,9 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
+        if (jumpAnimName.length() > 0)
+            mJumpAnimName = jumpAnimName;
+
         if(mJumpState == JumpState_InAir)
         {
             mAnimation->disable(mCurrentJump);
@@ -555,6 +558,9 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (mPtr.getClass().isActor())
         refreshHitRecoilAnims();
 
+    if (isTurning() && mJumpState != JumpState_InAir)
+        mAnimation->disable(mJumpAnimName);
+
     const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
     if (!mPtr.getClass().isBipedal(mPtr))
         weap = sWeaponTypeListEnd;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index af90c18b8..c03702ef2 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -184,6 +184,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     JumpingState mJumpState;
     std::string mCurrentJump;
+    std::string mJumpAnimName;
 
     WeaponType mWeaponType;
     std::string mCurrentWeapon;

From 5c8f4914419fa3421d86f8884a517e942ce08f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.com>
Date: Sat, 28 Oct 2017 18:46:52 +0200
Subject: [PATCH 03/27] move animation disabling code to a better place

---
 apps/openmw/mwmechanics/character.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index dc910c577..83c7ce844 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -558,9 +558,6 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (mPtr.getClass().isActor())
         refreshHitRecoilAnims();
 
-    if (isTurning() && mJumpState != JumpState_InAir)
-        mAnimation->disable(mJumpAnimName);
-
     const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
     if (!mPtr.getClass().isBipedal(mPtr))
         weap = sWeaponTypeListEnd;
@@ -1883,9 +1880,15 @@ void CharacterController::update(float duration)
             else if(rot.z() != 0.0f && !sneak && !(mPtr == getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 if(rot.z() > 0.0f)
+                {
                     movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
+                    mAnimation->disable(mJumpAnimName);
+                }
                 else if(rot.z() < 0.0f)
+                {
                     movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
+                    mAnimation->disable(mJumpAnimName);
+                }
             }
         }
 

From 1ee5dcff775995f783478204954786ece270b677 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 28 Oct 2017 20:56:08 +0100
Subject: [PATCH 04/27] added a function to determine if a script contains
 OnActivate

---
 apps/openmw/mwbase/scriptmanager.hpp      | 4 ++++
 apps/openmw/mwscript/scriptmanagerimp.cpp | 6 ++++++
 apps/openmw/mwscript/scriptmanagerimp.hpp | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/apps/openmw/mwbase/scriptmanager.hpp b/apps/openmw/mwbase/scriptmanager.hpp
index 7bdeba132..44d350115 100644
--- a/apps/openmw/mwbase/scriptmanager.hpp
+++ b/apps/openmw/mwbase/scriptmanager.hpp
@@ -42,6 +42,10 @@ namespace MWBase
             ///< Compile script with the given namen
             /// \return Success?
 
+            virtual bool hasOnActivate (const std::string& name) = 0;
+            ///< Determine if a script with the given name contains OnActivate
+            /// \return Contains OnActivate?
+
             virtual std::pair<int, int> compileAll() = 0;
             ///< Compile all scripts
             /// \return count, success
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 7c1f9bf4d..01ff97be2 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -88,6 +88,12 @@ namespace MWScript
         return false;
     }
 
+    bool ScriptManager::hasOnActivate(const std::string& name)
+    {
+        const ESM::Script *script = mStore.get<ESM::Script>().find(name);
+        return script->mScriptText.find("OnActivate");
+    }
+
     void ScriptManager::run (const std::string& name, Interpreter::Context& interpreterContext)
     {
         // compile script
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index c22a5da81..3835be26e 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -62,6 +62,10 @@ namespace MWScript
             ///< Compile script with the given namen
             /// \return Success?
 
+            virtual bool hasOnActivate(const std::string& name);
+            ///< Determine if a script with the given name contains OnActivate
+            /// \return Contains OnActivate?
+
             virtual std::pair<int, int> compileAll();
             ///< Compile all scripts
             /// \return count, success

From 4e6f53d6f16572086ad1c0d5455e16ed3ce359af Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sun, 29 Oct 2017 11:45:17 +0000
Subject: [PATCH 05/27] item added to the player and OnActivate is triggered
 when the inventory is closed

---
 apps/openmw/mwgui/inventorywindow.cpp  | 20 ++++++++++++++++++++
 apps/openmw/mwgui/inventorywindow.hpp  |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index b3697008c..8586cfb5b 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -1,6 +1,7 @@
 #include "inventorywindow.hpp"
 
 #include <stdexcept>
+#include <algorithm>
 
 #include <MyGUI_Window.h>
 #include <MyGUI_ImageBox.h>
@@ -149,6 +150,15 @@ namespace MWGui
         mItemView->setModel(NULL);
     }
 
+    void InventoryWindow::activateItems()
+    {
+        for (std::vector<MWWorld::Ptr>::iterator it = mItemsToActivate.begin(); it != mItemsToActivate.end(); it++)
+        {
+            it->getRefData().activate();
+        }
+        mItemsToActivate.clear();
+    }
+
     void InventoryWindow::setGuiMode(GuiMode mode)
     {
         std::string setting = "inventory";
@@ -653,6 +663,16 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
+        std::string scriptName = object.getClass().getScript(object); // Objects that have OnActivte in their script cannot be picked up through inventory
+        if (!scriptName.empty() && MWBase::Environment::get().getScriptManager()->hasOnActivate(scriptName))
+        {
+            if (std::find(mItemsToActivate.begin(), mItemsToActivate.end(), object) == mItemsToActivate.end())
+            {
+                mItemsToActivate.push_back(object);
+            }
+            return;
+        }
+
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 5576b52ed..3f88d8822 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -58,6 +58,8 @@ namespace MWGui
 
             void clear();
 
+            void activateItems();
+
             void useItem(const MWWorld::Ptr& ptr);
 
             void setGuiMode(GuiMode mode);
@@ -70,6 +72,8 @@ namespace MWGui
 
             int mSelectedItem;
 
+            std::vector<MWWorld::Ptr> mItemsToActivate;
+
             MWWorld::Ptr mPtr;
 
             MWGui::ItemView* mItemView;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index ccdd6916c..e2a10ccc3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1171,6 +1171,8 @@ namespace MWGui
             mGuiModeStates[mode].update(false);
             if (!noSound)
                 playSound(mGuiModeStates[mode].mCloseSound);
+            if (mode == GM_Inventory)
+                mInventoryWindow->activateItems(); // Activate cursed items when inventory is closed
         }
 
         if (!mGuiModes.empty())

From 7bc512974f2d2d663c6813cd3d55de337b7c1858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.com>
Date: Mon, 30 Oct 2017 15:26:38 +0100
Subject: [PATCH 06/27] use mcurrentjump instead of custom attrib

---
 apps/openmw/mwmechanics/character.cpp | 12 +++++-------
 apps/openmw/mwmechanics/character.hpp |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 83c7ce844..a2e07fc5c 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -372,9 +372,6 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
-        if (jumpAnimName.length() > 0)
-            mJumpAnimName = jumpAnimName;
-
         if(mJumpState == JumpState_InAir)
         {
             mAnimation->disable(mCurrentJump);
@@ -385,8 +382,9 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
         }
         else
         {
-            mAnimation->disable(mCurrentJump);
-            mCurrentJump.clear();
+            if (startAtLoop) 
+                mAnimation->disable(mCurrentJump);
+
             if (mAnimation->hasAnimation("jump"))
                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
                              1.0f, "loop stop", "stop", 0.0f, 0);
@@ -1882,12 +1880,12 @@ void CharacterController::update(float duration)
                 if(rot.z() > 0.0f)
                 {
                     movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
-                    mAnimation->disable(mJumpAnimName);
+                    mAnimation->disable(mCurrentJump);
                 }
                 else if(rot.z() < 0.0f)
                 {
                     movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
-                    mAnimation->disable(mJumpAnimName);
+                    mAnimation->disable(mCurrentJump);
                 }
             }
         }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index c03702ef2..af90c18b8 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -184,7 +184,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     JumpingState mJumpState;
     std::string mCurrentJump;
-    std::string mJumpAnimName;
 
     WeaponType mWeaponType;
     std::string mCurrentWeapon;

From e8743f3f795ff8b4b7c3bfe103ca930587872258 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Mon, 30 Oct 2017 20:59:36 +0000
Subject: [PATCH 07/27] check the presence of OnActivate using the
 SuppressActivate flag instead of looking for keywords

---
 apps/openmw/mwbase/scriptmanager.hpp      | 4 ----
 apps/openmw/mwgui/inventorywindow.cpp     | 3 +--
 apps/openmw/mwscript/scriptmanagerimp.cpp | 6 ------
 apps/openmw/mwscript/scriptmanagerimp.hpp | 4 ----
 apps/openmw/mwworld/refdata.cpp           | 5 +++++
 apps/openmw/mwworld/refdata.hpp           | 2 ++
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwbase/scriptmanager.hpp b/apps/openmw/mwbase/scriptmanager.hpp
index 44d350115..7bdeba132 100644
--- a/apps/openmw/mwbase/scriptmanager.hpp
+++ b/apps/openmw/mwbase/scriptmanager.hpp
@@ -42,10 +42,6 @@ namespace MWBase
             ///< Compile script with the given namen
             /// \return Success?
 
-            virtual bool hasOnActivate (const std::string& name) = 0;
-            ///< Determine if a script with the given name contains OnActivate
-            /// \return Contains OnActivate?
-
             virtual std::pair<int, int> compileAll() = 0;
             ///< Compile all scripts
             /// \return count, success
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 8586cfb5b..5fe644d45 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -663,8 +663,7 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
-        std::string scriptName = object.getClass().getScript(object); // Objects that have OnActivte in their script cannot be picked up through inventory
-        if (!scriptName.empty() && MWBase::Environment::get().getScriptManager()->hasOnActivate(scriptName))
+        if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
         {
             if (std::find(mItemsToActivate.begin(), mItemsToActivate.end(), object) == mItemsToActivate.end())
             {
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 01ff97be2..7c1f9bf4d 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -88,12 +88,6 @@ namespace MWScript
         return false;
     }
 
-    bool ScriptManager::hasOnActivate(const std::string& name)
-    {
-        const ESM::Script *script = mStore.get<ESM::Script>().find(name);
-        return script->mScriptText.find("OnActivate");
-    }
-
     void ScriptManager::run (const std::string& name, Interpreter::Context& interpreterContext)
     {
         // compile script
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index 3835be26e..c22a5da81 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -62,10 +62,6 @@ namespace MWScript
             ///< Compile script with the given namen
             /// \return Success?
 
-            virtual bool hasOnActivate(const std::string& name);
-            ///< Determine if a script with the given name contains OnActivate
-            /// \return Contains OnActivate?
-
             virtual std::pair<int, int> compileAll();
             ///< Compile all scripts
             /// \return count, success
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index f6fa3556f..95b0fb3e0 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -192,6 +192,11 @@ namespace MWWorld
         return mEnabled;
     }
 
+    bool RefData::hasSuppressActivate()
+    {
+        return mFlags & Flag_SuppressActivate;
+    }
+
     void RefData::enable()
     {
         if (!mEnabled)
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 75eec6742..4dfa9e91c 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -111,6 +111,8 @@ namespace MWWorld
 
             bool isEnabled() const;
 
+            bool hasSuppressActivate();
+
             void enable();
 
             void disable();

From ff1265c0e7b67e68462886ab0d2d3b5cbeda8d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Tue, 31 Oct 2017 14:22:24 +0100
Subject: [PATCH 08/27] refactor jump animation

---
 apps/openmw/mwmechanics/character.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index a2e07fc5c..f262850a4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -380,7 +380,7 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
                 mAnimation->play(mCurrentJump, Priority_Jump, jumpmask, false,
                              1.0f, (startAtLoop?"loop start":"start"), "stop", 0.0f, ~0ul);
         }
-        else
+        else if (mJumpState == JumpState_Landing)
         {
             if (startAtLoop) 
                 mAnimation->disable(mCurrentJump);
@@ -389,6 +389,14 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
                              1.0f, "loop stop", "stop", 0.0f, 0);
         }
+        else    // JumpState_None
+        {
+            if (mCurrentJump.length() > 0)
+            {
+                mAnimation->disable(mCurrentJump);
+                mCurrentJump.clear();
+            }
+        }
     }
 }
 
@@ -1693,7 +1701,6 @@ void CharacterController::update(float duration)
         mHasMovedInXY = std::abs(vec.x())+std::abs(vec.y()) > 0.0f;
         isrunning = isrunning && mHasMovedInXY;
 
-
         // advance athletics
         if(mHasMovedInXY && mPtr == getPlayer())
         {
@@ -1848,7 +1855,8 @@ void CharacterController::update(float duration)
         }
         else
         {
-            jumpstate = JumpState_None;
+            jumpstate = mAnimation->isPlaying(mCurrentJump) ? JumpState_Landing : JumpState_None;
+
             vec.z() = 0.0f;
 
             inJump = false;

From a9e5e1948270945bbb16be1219cb61a10ce8ddd8 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Tue, 31 Oct 2017 18:16:40 +0000
Subject: [PATCH 09/27] OnActivate is triggered when the item is picked up

---
 apps/openmw/mwgui/inventorywindow.cpp  | 26 +++++++-------------------
 apps/openmw/mwgui/inventorywindow.hpp  |  4 ----
 apps/openmw/mwgui/windowmanagerimp.cpp |  2 --
 apps/openmw/mwworld/actiontake.cpp     |  3 +++
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 5fe644d45..1e9f534d6 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -1,7 +1,6 @@
 #include "inventorywindow.hpp"
 
 #include <stdexcept>
-#include <algorithm>
 
 #include <MyGUI_Window.h>
 #include <MyGUI_ImageBox.h>
@@ -150,15 +149,6 @@ namespace MWGui
         mItemView->setModel(NULL);
     }
 
-    void InventoryWindow::activateItems()
-    {
-        for (std::vector<MWWorld::Ptr>::iterator it = mItemsToActivate.begin(); it != mItemsToActivate.end(); it++)
-        {
-            it->getRefData().activate();
-        }
-        mItemsToActivate.clear();
-    }
-
     void InventoryWindow::setGuiMode(GuiMode mode)
     {
         std::string setting = "inventory";
@@ -663,15 +653,6 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
-        if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
-        {
-            if (std::find(mItemsToActivate.begin(), mItemsToActivate.end(), object) == mItemsToActivate.end())
-            {
-                mItemsToActivate.push_back(object);
-            }
-            return;
-        }
-
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
@@ -682,6 +663,13 @@ namespace MWGui
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
         MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
+        
+        if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
+        {
+            newObject.getRefData().onActivate(); // set the flag_SuppressActivate flag for the new item
+            newObject.getRefData().activate();
+        }
+
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject (object);
 
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 3f88d8822..5576b52ed 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -58,8 +58,6 @@ namespace MWGui
 
             void clear();
 
-            void activateItems();
-
             void useItem(const MWWorld::Ptr& ptr);
 
             void setGuiMode(GuiMode mode);
@@ -72,8 +70,6 @@ namespace MWGui
 
             int mSelectedItem;
 
-            std::vector<MWWorld::Ptr> mItemsToActivate;
-
             MWWorld::Ptr mPtr;
 
             MWGui::ItemView* mItemView;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index e2a10ccc3..ccdd6916c 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1171,8 +1171,6 @@ namespace MWGui
             mGuiModeStates[mode].update(false);
             if (!noSound)
                 playSound(mGuiModeStates[mode].mCloseSound);
-            if (mode == GM_Inventory)
-                mInventoryWindow->activateItems(); // Activate cursed items when inventory is closed
         }
 
         if (!mGuiModes.empty())
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index d858859a6..52e30c8ac 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -14,6 +14,9 @@ namespace MWWorld
 
     void ActionTake::executeImp (const Ptr& actor)
     {
+        //No need to do anything if moving items from the player's inventory back into player's inventory
+        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && getTarget().getCell() == 0)
+            return;
         MWBase::Environment::get().getMechanicsManager()->itemTaken(
                     actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
         MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);

From 5b8610b34b61e5b587cc196205aa3bb1275d5967 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Wed, 1 Nov 2017 23:44:50 +0000
Subject: [PATCH 10/27] knocked out characters wait some time before getting up

---
 apps/openmw/mwmechanics/character.cpp | 6 +++++-
 apps/openmw/mwmechanics/character.hpp | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 03acfdaf2..c3ca8f512 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -248,12 +248,15 @@ void CharacterController::refreshHitRecoilAnims()
     bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
     bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
     bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
+    MWWorld::TimeStamp currentTime = MWBase::Environment::get().getWorld()->getTimeStamp();
+    float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
     if(mHitState == CharState_None)
     {
         if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
                 || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
                 && mAnimation->hasAnimation("knockout"))
         {
+            mKnockoutTime = MWBase::Environment::get().getWorld()->getTimeStamp();
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
@@ -338,7 +341,8 @@ void CharacterController::refreshHitRecoilAnims()
             mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
         mHitState = CharState_None;
     }
-    else if (isKnockedOut() && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0)
+    else if (isKnockedOut() && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0 
+            && (currentTime - mKnockoutTime) > 3*timeScale/3600) //Wait 3 seconds before getting up
     {
         mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
         mAnimation->disable(mCurrentHit);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index af90c18b8..0654b8534 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -7,6 +7,7 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/timestamp.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -196,6 +197,8 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     float mSecondsOfSwimming;
     float mSecondsOfRunning;
 
+    MWWorld::TimeStamp mKnockoutTime;
+
     MWWorld::ConstPtr mHeadTrackTarget;
 
     float mTurnAnimationThreshold; // how long to continue playing turning animation after actor stopped turning

From de83ad0116c434e8bf90ab4f330a93e50f392191 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 00:24:09 +0000
Subject: [PATCH 11/27] use real time; wait random number of seconds

---
 apps/openmw/mwmechanics/character.cpp | 7 +++----
 apps/openmw/mwmechanics/character.hpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c3ca8f512..dffc095e9 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -248,15 +248,14 @@ void CharacterController::refreshHitRecoilAnims()
     bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
     bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
     bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
-    MWWorld::TimeStamp currentTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-    float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
     if(mHitState == CharState_None)
     {
         if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
                 || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
                 && mAnimation->hasAnimation("knockout"))
         {
-            mKnockoutTime = MWBase::Environment::get().getWorld()->getTimeStamp();
+            mTimeToWake = time(NULL);
+            mTimeToWake += rand() % 2 + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
@@ -342,7 +341,7 @@ void CharacterController::refreshHitRecoilAnims()
         mHitState = CharState_None;
     }
     else if (isKnockedOut() && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0 
-            && (currentTime - mKnockoutTime) > 3*timeScale/3600) //Wait 3 seconds before getting up
+            && time(NULL) > mTimeToWake)
     {
         mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
         mAnimation->disable(mCurrentHit);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 0654b8534..af8415e35 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -197,7 +197,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     float mSecondsOfSwimming;
     float mSecondsOfRunning;
 
-    MWWorld::TimeStamp mKnockoutTime;
+    time_t mTimeToWake;
 
     MWWorld::ConstPtr mHeadTrackTarget;
 

From bcbfa5fe1e97696a96794b0b55d3ec8b427a1212 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 00:38:33 +0000
Subject: [PATCH 12/27] prevent activation, leave the rest to the script

---
 apps/openmw/mwgui/inventorywindow.cpp | 9 +++------
 apps/openmw/mwworld/actiontake.cpp    | 3 ---
 apps/openmw/mwworld/refdata.cpp       | 5 -----
 apps/openmw/mwworld/refdata.hpp       | 2 --
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 1e9f534d6..063bc5c01 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -653,6 +653,9 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
+        if (!object.getRefData().activate())
+            return;
+
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
@@ -663,12 +666,6 @@ namespace MWGui
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
         MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
-        
-        if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
-        {
-            newObject.getRefData().onActivate(); // set the flag_SuppressActivate flag for the new item
-            newObject.getRefData().activate();
-        }
 
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject (object);
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 52e30c8ac..d858859a6 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -14,9 +14,6 @@ namespace MWWorld
 
     void ActionTake::executeImp (const Ptr& actor)
     {
-        //No need to do anything if moving items from the player's inventory back into player's inventory
-        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && getTarget().getCell() == 0)
-            return;
         MWBase::Environment::get().getMechanicsManager()->itemTaken(
                     actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
         MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 95b0fb3e0..f6fa3556f 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -192,11 +192,6 @@ namespace MWWorld
         return mEnabled;
     }
 
-    bool RefData::hasSuppressActivate()
-    {
-        return mFlags & Flag_SuppressActivate;
-    }
-
     void RefData::enable()
     {
         if (!mEnabled)
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 4dfa9e91c..75eec6742 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -111,8 +111,6 @@ namespace MWWorld
 
             bool isEnabled() const;
 
-            bool hasSuppressActivate();
-
             void enable();
 
             void disable();

From 8c2cc0f42fa6b6e7717962a87a1d2c584460ca0b Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 00:44:16 +0000
Subject: [PATCH 13/27] break invisibility first

---
 apps/openmw/mwgui/inventorywindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 063bc5c01..e1301edd4 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -653,13 +653,13 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
-        if (!object.getRefData().activate())
-            return;
-
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWBase::Environment::get().getWorld()->breakInvisibility(player);
+        
+        if (!object.getRefData().activate())
+            return;
 
         MWBase::Environment::get().getMechanicsManager()->itemTaken(player, object, MWWorld::Ptr(), count);
 

From ee2f3db9a87abf24341f4247b7748d5aa935ef6e Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 01:31:15 +0000
Subject: [PATCH 14/27] fixed randomness

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

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index dffc095e9..deb9daa93 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -255,7 +255,7 @@ void CharacterController::refreshHitRecoilAnims()
                 && mAnimation->hasAnimation("knockout"))
         {
             mTimeToWake = time(NULL);
-            mTimeToWake += rand() % 2 + 1; // Wake up after 1 to 3 seconds
+            mTimeToWake += (int)( (float)rand() / (float)RAND_MAX * 2) + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;

From ab66034ed17f045839f4fd16ac1fec4872e6afad Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 02:15:56 +0000
Subject: [PATCH 15/27] use uniform_int_distribution instead of rand()

---
 apps/openmw/mwmechanics/character.cpp | 6 +++++-
 apps/openmw/mwmechanics/character.hpp | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index deb9daa93..ade9d635b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -20,6 +20,7 @@
 #include "character.hpp"
 
 #include <iostream>
+#include <random>
 
 #include <components/misc/rng.hpp>
 
@@ -254,8 +255,11 @@ void CharacterController::refreshHitRecoilAnims()
                 || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
                 && mAnimation->hasAnimation("knockout"))
         {
+            std::random_device r;
+            std::mt19937 gen(r());
+            std::uniform_int_distribution<int> dist(1, 3);
             mTimeToWake = time(NULL);
-            mTimeToWake += (int)( (float)rand() / (float)RAND_MAX * 2) + 1; // Wake up after 1 to 3 seconds
+            mTimeToWake += dist(gen); // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index af8415e35..12b4d6adc 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -7,7 +7,6 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/timestamp.hpp"
 
 #include "../mwrender/animation.hpp"
 

From f34223fce9ec847a5694825e32867294be1e326f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Thu, 2 Nov 2017 20:01:22 +0100
Subject: [PATCH 16/27] check the real distance to target in aipursue

---
 apps/openmw/mwmechanics/aipursue.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index f9884eb6d..835966467 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -50,8 +50,13 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
 
     //Set the target desition from the actor
     ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
+    ESM::Position aPos = actor.getRefData().getPosition();
 
-    if (pathTo(actor, dest, duration, 100)) {
+    float pathTolerance = 100.0;
+
+    if (pathTo(actor, dest, duration, pathTolerance) &&
+        MWMechanics::distance(dest,aPos.pos[0],aPos.pos[1],aPos.pos[2]) < pathTolerance)  // check the true distance in case the target is far away in Z-direction
+    {
         target.getClass().activate(target,actor).get()->execute(actor); //Arrest player when reached
         return true;
     }

From 48ec680f233f2ea616569e77872d757df7a488a0 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 19:37:20 +0000
Subject: [PATCH 17/27] use game time instead of real time

---
 apps/openmw/mwmechanics/character.cpp | 17 ++++++++++-------
 apps/openmw/mwmechanics/character.hpp |  4 +++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index ade9d635b..83d6cc1f3 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -20,7 +20,6 @@
 #include "character.hpp"
 
 #include <iostream>
-#include <random>
 
 #include <components/misc/rng.hpp>
 
@@ -243,6 +242,11 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
     return prefix + toString(roll);
 }
 
+void CharacterController::updateKnockoutTimer(float duration)
+{
+    mTimeUntilWake -= duration;
+}
+
 void CharacterController::refreshHitRecoilAnims()
 {
     bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
@@ -255,11 +259,7 @@ void CharacterController::refreshHitRecoilAnims()
                 || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
                 && mAnimation->hasAnimation("knockout"))
         {
-            std::random_device r;
-            std::mt19937 gen(r());
-            std::uniform_int_distribution<int> dist(1, 3);
-            mTimeToWake = time(NULL);
-            mTimeToWake += dist(gen); // Wake up after 1 to 3 seconds
+            mTimeUntilWake = Misc::Rng::rollClosedProbability() * 2 + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
@@ -345,7 +345,7 @@ void CharacterController::refreshHitRecoilAnims()
         mHitState = CharState_None;
     }
     else if (isKnockedOut() && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0 
-            && time(NULL) > mTimeToWake)
+            && mTimeUntilWake <= 0)
     {
         mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
         mAnimation->disable(mCurrentHit);
@@ -1635,6 +1635,9 @@ void CharacterController::update(float duration)
     float speed = 0.f;
 
     updateMagicEffects();
+        
+    if (isKnockedOut())
+        updateKnockoutTimer(duration);
 
     bool godmode = mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 12b4d6adc..0b9e60c11 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -196,7 +196,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     float mSecondsOfSwimming;
     float mSecondsOfRunning;
 
-    time_t mTimeToWake;
+    float mTimeUntilWake;
 
     MWWorld::ConstPtr mHeadTrackTarget;
 
@@ -226,6 +226,8 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void updateMagicEffects();
 
+    void updateKnockoutTimer(float duration);
+
     void playDeath(float startpoint, CharacterState death);
     CharacterState chooseRandomDeathState() const;
     void playRandomDeath(float startpoint = 0.0f);

From e3c42251f99744e30164d0a258a0b4cc82e3a4f7 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 5 Nov 2017 15:36:26 +0000
Subject: [PATCH 18/27] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 839a04e42..c4190343d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -129,6 +129,7 @@ Programmers
     Radu-Marius Popovici (rpopovici)
     Rafael Moura (dhustkoder)
     rdimesio
+    rexelion
     riothamus
     Rob Cutmore (rcutmore)
     Robert MacGregor (Ragora)

From 282800b5b24b6ac9aa127031dfcec7a78e873bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 5 Nov 2017 16:37:38 +0100
Subject: [PATCH 19/27] Create LICENSE (#1532)

* Create LICENSE

Let's add the license file so that GitHub officially registers it and displays it next to the project.

* move license files

* update licenses in cmakelists.txt

* fix link in README
---
 CMakeLists.txt                                        | 6 +++---
 docs/license/GPL3.txt => LICENSE                      | 6 +++---
 README.md                                             | 4 ++--
 {docs/license => files/mygui}/DejaVu Font License.txt | 0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename docs/license/GPL3.txt => LICENSE (99%)
 rename {docs/license => files/mygui}/DejaVu Font License.txt (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47678e7d..507c89c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,7 +412,7 @@ IF(NOT WIN32 AND NOT APPLE)
     #ENDIF(BUILD_MYGUI_PLUGIN)
 
     # Install licenses
-    INSTALL(FILES "docs/license/DejaVu Font License.txt" DESTINATION "${LICDIR}" )
+    INSTALL(FILES "files/mygui/DejaVu Font License.txt" DESTINATION "${LICDIR}" )
 
     # Install icon and desktop file
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
@@ -446,9 +446,9 @@ if(WIN32)
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "." RENAME "openmw.cfg")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt")
     INSTALL(FILES
-        "${OpenMW_SOURCE_DIR}/Docs/license/GPL3.txt"
-        "${OpenMW_SOURCE_DIR}/Docs/license/DejaVu Font License.txt"
+        "${OpenMW_SOURCE_DIR}/files/mygui/DejaVu Font License.txt"
         "${OpenMW_BINARY_DIR}/settings-default.cfg"
         "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt"
         DESTINATION ".")
diff --git a/docs/license/GPL3.txt b/LICENSE
similarity index 99%
rename from docs/license/GPL3.txt
rename to LICENSE
index 94a9ed024..9cecc1d46 100644
--- a/docs/license/GPL3.txt
+++ b/LICENSE
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/README.md b/README.md
index aa6ae47b4..3e5556cb4 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@ OpenMW is a recreation of the engine for the popular role-playing game Morrowind
 OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
 
 * Version: 0.42.0
-* License: GPLv3 (see [docs/license/GPL3.txt](https://github.com/OpenMW/openmw/blob/master/docs/license/GPL3.txt) for more information)
+* License: GPLv3 (see [LICENSE](https://github.com/OpenMW/openmw/blob/master/LICENSE) for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net
 
 Font Licenses:
-* DejaVuLGCSansMono.ttf: custom (see docs/license/DejaVu Font License.txt for more information)
+* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVu Font License.txt](https://github.com/OpenMW/openmw/blob/master/files/mygui/DejaVu%20Font%20License.txt) for more information)
 
 Current Status
 --------------
diff --git a/docs/license/DejaVu Font License.txt b/files/mygui/DejaVu Font License.txt
similarity index 100%
rename from docs/license/DejaVu Font License.txt
rename to files/mygui/DejaVu Font License.txt

From de7a7d842bb6d90660c8da66c47ec30ec8091c06 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sun, 5 Nov 2017 18:30:34 +0000
Subject: [PATCH 20/27] mTimeUntilWake is initialised in the constructor

---
 apps/openmw/mwmechanics/character.cpp | 8 ++------
 apps/openmw/mwmechanics/character.hpp | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 83d6cc1f3..0f99725fd 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -242,11 +242,6 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
     return prefix + toString(roll);
 }
 
-void CharacterController::updateKnockoutTimer(float duration)
-{
-    mTimeUntilWake -= duration;
-}
-
 void CharacterController::refreshHitRecoilAnims()
 {
     bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
@@ -766,6 +761,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mSecondsOfRunning(0)
     , mTurnAnimationThreshold(0)
     , mAttackingOrSpell(false)
+    , mTimeUntilWake(0.f)
 {
     if(!mAnimation)
         return;
@@ -1637,7 +1633,7 @@ void CharacterController::update(float duration)
     updateMagicEffects();
         
     if (isKnockedOut())
-        updateKnockoutTimer(duration);
+        mTimeUntilWake -= duration;
 
     bool godmode = mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 0b9e60c11..6de18fe62 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -226,8 +226,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void updateMagicEffects();
 
-    void updateKnockoutTimer(float duration);
-
     void playDeath(float startpoint, CharacterState death);
     CharacterState chooseRandomDeathState() const;
     void playRandomDeath(float startpoint = 0.0f);

From 430d01a39a61342e11048c4c166692fbb2a1c64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 5 Nov 2017 20:19:47 +0100
Subject: [PATCH 21/27] additional animation refactor

---
 apps/openmw/mwmechanics/character.cpp | 29 +++++++++++++--------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index f262850a4..107ccf09b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -372,29 +372,28 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
-        if(mJumpState == JumpState_InAir)
+        if (!mCurrentJump.empty())
         {
             mAnimation->disable(mCurrentJump);
-            mCurrentJump = jumpAnimName;
-            if (mAnimation->hasAnimation("jump"))
-                mAnimation->play(mCurrentJump, Priority_Jump, jumpmask, false,
+            mCurrentJump.clear();
+        }
+
+        if(mJumpState == JumpState_InAir)
+        {
+            if (mAnimation->hasAnimation(jumpAnimName))
+            {
+                mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false,
                              1.0f, (startAtLoop?"loop start":"start"), "stop", 0.0f, ~0ul);
+                mCurrentJump = jumpAnimName;
+            }
         }
         else if (mJumpState == JumpState_Landing)
         {
-            if (startAtLoop) 
-                mAnimation->disable(mCurrentJump);
-
-            if (mAnimation->hasAnimation("jump"))
+             if (mAnimation->hasAnimation(jumpAnimName))
+             {
                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
                              1.0f, "loop stop", "stop", 0.0f, 0);
-        }
-        else    // JumpState_None
-        {
-            if (mCurrentJump.length() > 0)
-            {
-                mAnimation->disable(mCurrentJump);
-                mCurrentJump.clear();
+                mCurrentJump = jumpAnimName;
             }
         }
     }

From f98a821482e51b2c1bbb5a6c7c43393608dee2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 5 Nov 2017 23:46:15 +0100
Subject: [PATCH 22/27] fix possible bug in aipursue

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

diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 835966467..27d4ab0cb 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -55,7 +55,7 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
     float pathTolerance = 100.0;
 
     if (pathTo(actor, dest, duration, pathTolerance) &&
-        MWMechanics::distance(dest,aPos.pos[0],aPos.pos[1],aPos.pos[2]) < pathTolerance)  // check the true distance in case the target is far away in Z-direction
+        abs(dest.mZ - aPos.pos[2]) < pathTolerance)      // check the true distance in case the target is far away in Z-direction
     {
         target.getClass().activate(target,actor).get()->execute(actor); //Arrest player when reached
         return true;

From 7b4add2ae4b83aaad977c63e53322f7ed0055ce7 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 7 Nov 2017 23:44:38 +0100
Subject: [PATCH 23/27] Fall back to non-shader material if creating the shader
 fails

Also fixes an uncaught exception that will break the whole game.
---
 components/terrain/material.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 8aec54835..640f2932b 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -116,7 +116,10 @@ namespace Terrain
                 osg::ref_ptr<osg::Shader> vertexShader = shaderManager->getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
                 osg::ref_ptr<osg::Shader> fragmentShader = shaderManager->getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
                 if (!vertexShader || !fragmentShader)
-                    throw std::runtime_error("Unable to create shader");
+                {
+                    // Try again without shader. Error already logged by above
+                    return createPasses(false, forcePerPixelLighting, clampLighting, shaderManager, layers, blendmaps, blendmapScale, layerTileSize);
+                }
 
                 stateset->setAttributeAndModes(shaderManager->getProgram(vertexShader, fragmentShader));
             }

From 244cc5b861c58f284b01f071400cd47254006014 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 7 Nov 2017 23:54:31 +0100
Subject: [PATCH 24/27] Reduce error spam

---
 components/shader/shadermanager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 7cb49c6cb..5efd1b86e 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -131,7 +131,11 @@ namespace Shader
         {
             std::string shaderSource = templateIt->second;
             if (!parseDefines(shaderSource, defines))
+            {
+                // Add to the cache anyway to avoid logging the same error over and over.
+                mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), nullptr));
                 return NULL;
+            }
 
             osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
             shader->setShaderSource(shaderSource);

From e42bd71081010b5c5484b54ed4fc811e7ccf13fe Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 8 Nov 2017 00:03:02 +0100
Subject: [PATCH 25/27] Add missing WaitDialog::clear() (Fixes #4196)

---
 apps/openmw/mwgui/waitdialog.cpp | 6 ++++++
 apps/openmw/mwgui/waitdialog.hpp | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index a7ad687cb..61febf315 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -96,6 +96,12 @@ namespace MWGui
         return (!mTimeAdvancer.isRunning()); //Only exit if not currently waiting
     }
 
+    void WaitDialog::clear()
+    {
+        mSleeping = false;
+        mTimeAdvancer.stop();
+    }
+
     void WaitDialog::onOpen()
     {
         if (mTimeAdvancer.isRunning())
diff --git a/apps/openmw/mwgui/waitdialog.hpp b/apps/openmw/mwgui/waitdialog.hpp
index eb6a55640..2aecb002f 100644
--- a/apps/openmw/mwgui/waitdialog.hpp
+++ b/apps/openmw/mwgui/waitdialog.hpp
@@ -33,6 +33,8 @@ namespace MWGui
 
         virtual bool exit();
 
+        virtual void clear();
+
         void onFrame(float dt);
 
         bool getSleeping() { return mTimeAdvancer.isRunning() && mSleeping; }

From 95b3c1181a873ac9b5f3269e950a6ea17c4b732d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 8 Nov 2017 00:53:06 +0100
Subject: [PATCH 26/27] Update shader with a non-color tracking material when
 equipment is changed during chameleon/invisibility effects (Fixes #4190)

---
 apps/openmw/mwrender/npcanimation.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 8211c2f5f..ece57c273 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -388,9 +388,6 @@ void NpcAnimation::rebuild()
 {
     updateNpcBase();
 
-    if (mAlpha != 1.f)
-        mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
-
     MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);
 }
 
@@ -651,6 +648,9 @@ void NpcAnimation::updateParts()
 
     if (wasArrowAttached)
         attachArrow();
+
+    if (mAlpha != 1.f)
+        mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
 }
 
 
@@ -917,6 +917,8 @@ void NpcAnimation::showWeapons(bool showWeapon)
                     attachArrow();
             }
         }
+        if (mAlpha != 1.f)
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
     }
     else
     {
@@ -942,6 +944,8 @@ void NpcAnimation::showCarriedLeft(bool show)
             if (iter->getTypeName() == typeid(ESM::Light).name() && mObjectParts[ESM::PRT_Shield])
                 addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), iter->get<ESM::Light>()->mBase);
         }
+        if (mAlpha != 1.f)
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
     }
     else
         removeIndividualPart(ESM::PRT_Shield);

From 9ecdcc187f76028bfa9c2a26d53345cb89b16dc5 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 8 Nov 2017 01:08:26 +0100
Subject: [PATCH 27/27] Clarify a warning message refers to inventory objects

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

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index cd04a425b..981f63e34 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -806,7 +806,7 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory)
             case ESM::REC_WEAP: readEquipmentState (getState (weapons, state), thisIndex, inventory); break;
             case ESM::REC_LIGH: readEquipmentState (getState (lights, state), thisIndex, inventory); break;
             case 0:
-                std::cerr << "Warning: Dropping reference to '" << state.mRef.mRefID << "' (object no longer exists)" << std::endl;
+                std::cerr << "Dropping inventory reference to '" << state.mRef.mRefID << "' (object no longer exists)" << std::endl;
                 break;
             default:
                 std::cerr << "Warning: Invalid item type in inventory state, refid " << state.mRef.mRefID << std::endl;