Merge branch 'master' into 'freeunrealestate'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -100,6 +100,7 @@
     Bug #5821: NPCs from mods getting removed if mod order was changed
     Bug #5835: OpenMW doesn't accept negative values for NPC's hello, alarm, fight, and flee
     Bug #5836: OpenMW dialogue/greeting/voice filter doesn't accept negative Ai values for NPC's hello, alarm, fight, and flee
+    Bug #5840: GetSoundPlaying "Health Damage" doesn't play when NPC hits target with shield effect ( vanilla engine behavior )
     Bug #5841: Can't Cast Zero Cost Spells When Magicka is < 0
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
@@ -133,6 +134,7 @@
     Feature #5813: Instanced groundcover support
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
+    Task #5844: Update 'toggle sneak' documentation
 
 0.46.0
 ------

apps/openmw/mwmechanics/combat.cpp

@@ -345,6 +345,8 @@ namespace MWMechanics
             MWMechanics::DynamicStat<float> health = attackerStats.getHealth();
             health.setCurrent(health.getCurrent() - x);
             attackerStats.setHealth(health);
+
+            MWBase::Environment::get().getSoundManager()->playSound3D(attacker, "Health Damage", 1.0f, 1.0f);
         }
     }
 

apps/openmw/mwphysics/movementsolver.cpp

@@ -38,7 +38,7 @@ namespace MWPhysics
         ContactCollectionCallback(const btCollisionObject * me, osg::Vec3f velocity) : mMe(me)
         {
             m_collisionFilterGroup = me->getBroadphaseHandle()->m_collisionFilterGroup;
-            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask;
+            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask & ~CollisionType_Projectile;
             mVelocity = Misc::Convert::toBullet(velocity);
         }
         btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) override

components/misc/endianness.hpp

@@ -2,6 +2,8 @@
 #define COMPONENTS_MISC_ENDIANNESS_H
 
 #include <cstdint>
+#include <cstring>
+#include <type_traits>
 
 namespace Misc
 {
@@ -15,20 +17,26 @@ namespace Misc
 
         if constexpr (sizeof(T) == 2)
         {
-            uint16_t& v16 = *reinterpret_cast<uint16_t*>(&v);
+            uint16_t v16;
+            std::memcpy(&v16, &v, sizeof(T));
             v16 = (v16 >> 8) | (v16 << 8);
+            std::memcpy(&v, &v16, sizeof(T));
         }
         if constexpr (sizeof(T) == 4)
         {
-            uint32_t& v32 = *reinterpret_cast<uint32_t*>(&v);
-            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) || v32 << 24;
+            uint32_t v32;
+            std::memcpy(&v32, &v, sizeof(T));
+            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) | v32 << 24;
+            std::memcpy(&v, &v32, sizeof(T));
         }
         if constexpr (sizeof(T) == 8)
         {
-            uint64_t& v64 = *reinterpret_cast<uint64_t*>(&v);
+            uint64_t v64;
+            std::memcpy(&v64, &v, sizeof(T));
             v64 = (v64 >> 56) | ((v64 & 0x00ff'0000'0000'0000) >> 40) | ((v64 & 0x0000'ff00'0000'0000) >> 24)
                 | ((v64 & 0x0000'00ff'0000'0000) >> 8) | ((v64 & 0x0000'0000'ff00'0000) << 8)
                 | ((v64 & 0x0000'0000'00ff'0000) << 24) | ((v64 & 0x0000'0000'0000'ff00) << 40) | (v64 << 56);
+            std::memcpy(&v, &v64, sizeof(T));
         }
     }
 

docs/source/reference/modding/settings/input.rst

@@ -38,7 +38,7 @@ This setting causes the behavior of the sneak key (bound to Ctrl by default)
 to toggle sneaking on and off rather than requiring the key to be held down while sneaking.
 Players that spend significant time sneaking may find the character easier to control with this option enabled.
 
-This setting can only be configured by editing the settings configuration file.
+This setting can be toggled in the launcher under "Advanced" -> "Game Mechanics" -> "Toggle sneak".
 
 always run
 ----------