Merge branch 'development' into 470-make-existing-build-workflows-reusable

Author: traunts

Entities/MOSRotating.cpp

@@ -1146,11 +1146,18 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector &impactImpulse, MovableObje
 
 				gibParticleClone->SetPos(m_Pos + rotatedGibOffset);
 				gibParticleClone->SetHFlipped(m_HFlipped);
-				Vector gibVelocity = rotatedGibOffset.IsZero() ? Vector(minVelocity + RandomNum(0.0F, velocityRange), 0.0F) : rotatedGibOffset.SetMagnitude(minVelocity + RandomNum(0.0F, velocityRange));
+				Vector gibVelocity = Vector(minVelocity + RandomNum(0.0F, velocityRange), 0.0F);
+				
 				// TODO: Figure out how much the magnitude of an offset should affect spread
 				float gibSpread = (rotatedGibOffset.IsZero() && spread == 0.1F) ? c_PI : spread;
-
-				gibVelocity.RadRotate(gibSettingsObject.InheritsVelocity() > 0 ? impactImpulse.GetAbsRadAngle() : m_Rotation.GetRadAngle() + (m_HFlipped ? c_PI : 0));
+				// Determine the primary direction of the gib particles.
+				if (gibSettingsObject.InheritsVelocity() > 0 && !impactImpulse.IsZero()) {
+					gibVelocity.RadRotate(impactImpulse.GetAbsRadAngle());
+				} else if (!rotatedGibOffset.IsZero()) {
+					gibVelocity.RadRotate(rotatedGibOffset.GetAbsRadAngle());
+				} else {
+					gibVelocity.RadRotate(m_Rotation.GetRadAngle() + (m_HFlipped ? c_PI : 0));
+				}
 				// The "Even" spread will spread all gib particles evenly in an arc, while maintaining a randomized velocity magnitude.
 				if (gibSettingsObject.GetSpreadMode() == Gib::SpreadMode::SpreadEven) {
 					gibVelocity.RadRotate(gibSpread - (gibSpread * 2.0F * static_cast<float>(i) / static_cast<float>(count)));

Managers/UInputMan.cpp

@@ -1017,7 +1017,8 @@ namespace RTE {
 	void UInputMan::UpdateMouseInput() {
 		// Detect and store mouse movement input, translated to analog stick emulation
 		int mousePlayer = MouseUsedByPlayer();
-		if (mousePlayer != Players::NoPlayer) {
+		// TODO: Figure out a less shit solution to updating the mouse in GUIs when there are no mouse players configured, i.e. no player input scheme is using mouse+keyboard. For not just check if we're out of Activity.
+		if (!g_ActivityMan.IsInActivity() || mousePlayer != Players::NoPlayer) {
 			// Multiplying by 30 for sensitivity. TODO: Make sensitivity slider 1-50;
 			m_AnalogMouseData.m_X += m_RawMouseMovement.m_X * 3;
 			m_AnalogMouseData.m_Y += m_RawMouseMovement.m_Y * 3;