Merge remote-tracking branch 'origin/base' into base

Author: ReplayCoding

src/engine/sv_main.cpp

@@ -2909,12 +2909,6 @@ void SV_Frame( bool finalTick )
 		return;
 	}
 
-	// let the steam auth server process new connections
-	if ( IsPC() && sv.IsMultiplayer() )
-	{
-		Steam3Server().RunFrame();
-	}
-
 	g_ServerGlobalVariables.frametime = host_state.interval_per_tick;
 
 	bool bIsSimulating = SV_IsSimulating();
@@ -2961,5 +2955,11 @@ void SV_Frame( bool finalTick )
 
 	// lock string tables
 	networkStringTableContainerServer->Lock( true );
+
+	// let the steam auth server process new connections
+	if ( IsPC() && sv.IsMultiplayer() )
+	{
+		Steam3Server().RunFrame();
+	}
 }
 

src/game/client/tf/c_tf_player.cpp

@@ -8486,7 +8486,7 @@ int C_TFPlayer::GetVisionFilterFlags( bool bWeaponsCheck /*= false */  )
 
 	// check for holidays and add them in to the mix
 	// Halloween / Fullmoon vision
-	if ( TFGameRules()->IsHolidayActive( kHoliday_HalloweenOrFullMoon ) || true )
+	if ( TFGameRules()->IsHolidayActive( kHoliday_HalloweenOrFullMoon ) )
 	{
 		nVisionOptInFlags |= TF_VISION_FILTER_HALLOWEEN;
 	}

src/game/shared/econ/econ_item_system.cpp

@@ -520,11 +520,12 @@ class CGCUpdateItemSchema : public GCSDK::CGCClientJob
 		// Check if we're already up-to-date
 		m_nExpectedVersion = msg.Body().item_schema_version();
 		uint32 nCurrentSchemaVersion = ItemSystem()->GetItemSchema()->GetVersion();
-		if ( m_nExpectedVersion != 0 && m_nExpectedVersion == nCurrentSchemaVersion )
+		if ( m_nExpectedVersion != 0 && m_nExpectedVersion == nCurrentSchemaVersion || m_nExpectedVersion == 1265307132 && nCurrentSchemaVersion == 1797044324 )
 		{
 			Msg( "Current item schema is up-to-date with version %08X.\n", nCurrentSchemaVersion );
 			return true;
 		}
+		Warning( "Current item schema is outdated with version %d instead of %d.\n", nCurrentSchemaVersion, m_nExpectedVersion );
 
 		m_sSignature = msg.Body().signature();
 

src/game/shared/teamplayroundbased_gamerules.cpp

@@ -806,7 +806,7 @@ void CTeamplayRoundBasedRules::GoToIntermission( void )
 {
 	if ( IsInTournamentMode() == true
 #ifdef TF_DLL
-	&& TFGameRules() && !TFGameRules()->IsMannVsMachineMode()
+	&& TFGameRules() && TFGameRules()->IsMannVsMachineMode()
 #endif
 		)
 		return;

src/game/shared/tf/tf_weaponbase_melee.cpp

@@ -971,23 +971,7 @@ float CTFWeaponBaseMelee::GetForceScale( void )
 float CTFWeaponBaseMelee::GetMeleeDamage( CBaseEntity *pTarget, int* piDamageType, int* piCustomDamage )
 {
 	float flDamage = m_pWeaponInfo->GetWeaponData( m_iWeaponMode ).m_nDamage;
-	if (GetWeaponID() == TF_WEAPON_WRENCH && dynamic_cast<CBaseObject*>(pTarget))
-	{
-		// Don't stack damage mults for buildings if we're using a wrench.
-		// This is so that damage vs sappers and buildings are similar
-		// Sappers use a static value of 65 base damage, modified by the building damage multiplier
-		// However, buildings **are** usually affected by the base multiplier
-		float flDamageBuildingMult = 1.0f;
-		CALL_ATTRIB_HOOK_FLOAT(flDamageBuildingMult, mult_dmg_vs_buildings);
-		if (flDamageBuildingMult == 1.0f)
-		{
-			CALL_ATTRIB_HOOK_FLOAT(flDamage, mult_dmg);
-		}
-	}
-	else
-	{
-		CALL_ATTRIB_HOOK_FLOAT( flDamage, mult_dmg );
-	}
+	CALL_ATTRIB_HOOK_FLOAT( flDamage, mult_dmg );
 
 	int iCritDoesNoDamage = 0;
 	CALL_ATTRIB_HOOK_INT( iCritDoesNoDamage, crit_does_no_damage );

src/public/bone_setup.cpp

@@ -2632,14 +2632,14 @@ class CIKSolver
          X[i] = P[i];
       normalize(X);
 
-// Its y axis is perpendicular to P, so Y = unit( E - X(E·X) ).
+// Its y axis is perpendicular to P, so Y = unit( E - X(E⋅X) ).
 
       float dDOTx = dot(D,X);
       for (i = 0 ; i < 3 ; i++)
          Y[i] = D[i] - dDOTx * X[i];
       normalize(Y);
 
-// Its z axis is perpendicular to both X and Y, so Z = X×Y.
+// Its z axis is perpendicular to both X and Y, so Z = X⋅Y.
 
       cross(X,Y,Z);