General:

*         Upgraded Steamworks SDK to v1.29
*         Fixed mod compatibility problem with Multiplayer Base that was introduced in September.
*         In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid.

Virtual Reality:
*         Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled.
*         VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode.

Windows:
*         Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line.

OSX:
*         Upgraded to XCode 5.

10 files changed, 37 insertions, 18 deletions

diff --git a/mp/src/game/server/BaseAnimatingOverlay.cpp b/mp/src/game/server/BaseAnimatingOverlay.cpp
index 50c94361..36534bc0 100644
--- a/mp/src/game/server/BaseAnimatingOverlay.cpp
+++ b/mp/src/game/server/BaseAnimatingOverlay.cpp
@@ -104,9 +104,14 @@ void CAnimationLayer::Init( CBaseAnimatingOverlay *pOverlay )
 	m_nSequence = 0;
 	m_nPriority = 0;
 	m_nOrder.Set( CBaseAnimatingOverlay::MAX_OVERLAYS );
+
+	m_flBlendIn = 0.0;
+	m_flBlendOut = 0.0;
+
 	m_flKillRate = 100.0;
 	m_flKillDelay = 0.0;
 	m_flPlaybackRate = 1.0;
+	m_flLastEventCheck = 0.0;
 	m_flLastAccess = gpGlobals->curtime;
 	m_flLayerAnimtime = 0;
 	m_flLayerFadeOuttime = 0;
diff --git a/mp/src/game/server/EnvFade.cpp b/mp/src/game/server/EnvFade.cpp
index b3ed4b2c..fa0185d5 100644
--- a/mp/src/game/server/EnvFade.cpp
+++ b/mp/src/game/server/EnvFade.cpp
@@ -95,7 +95,7 @@ void CEnvFade::InputFade( inputdata_t &inputdata )
 
 	if ( m_spawnflags & SF_FADE_ONLYONE )
 	{
-		if ( inputdata.pActivator->IsNetClient() )
+		if ( inputdata.pActivator && inputdata.pActivator->IsNetClient() )
 		{
 			UTIL_ScreenFade( inputdata.pActivator, m_clrRender, Duration(), HoldTime(), fadeFlags );
 		}
diff --git a/mp/src/game/server/ai_utils.cpp b/mp/src/game/server/ai_utils.cpp
index 802a1c10..83847479 100644
--- a/mp/src/game/server/ai_utils.cpp
+++ b/mp/src/game/server/ai_utils.cpp
@@ -46,7 +46,7 @@ END_DATADESC()
 CAI_ShotRegulator::CAI_ShotRegulator() : m_nMinBurstShots(1), m_nMaxBurstShots(1)
 {
 	m_flMinRestInterval = 0.0f;
-	m_flMinRestInterval = 0.0f;
+	m_flMaxRestInterval = 0.0f;
 	m_flMinBurstInterval = 0.0f;
 	m_flMaxBurstInterval = 0.0f;
 	m_flNextShotTime = -1;
diff --git a/mp/src/game/server/baseentity.cpp b/mp/src/game/server/baseentity.cpp
index 52316924..b42f2abe 100644
--- a/mp/src/game/server/baseentity.cpp
+++ b/mp/src/game/server/baseentity.cpp
@@ -303,7 +303,7 @@ IMPLEMENT_SERVERCLASS_ST_NOBASE( CBaseEntity, DT_BaseEntity )
 	SendPropBool( SENDINFO( m_bAlternateSorting )),
 
 #ifdef TF_DLL
-	SendPropArray3( SENDINFO_ARRAY3(m_nModelIndexOverrides), SendPropInt( SENDINFO_ARRAY(m_nModelIndexOverrides), SP_MODEL_INDEX_BITS, SPROP_UNSIGNED ) ),
+	SendPropArray3( SENDINFO_ARRAY3(m_nModelIndexOverrides), SendPropInt( SENDINFO_ARRAY(m_nModelIndexOverrides), SP_MODEL_INDEX_BITS, 0 ) ),
 #endif
 
 END_SEND_TABLE()
diff --git a/mp/src/game/server/baseflex.cpp b/mp/src/game/server/baseflex.cpp
index 8e17fa75..4e6b4629 100644
--- a/mp/src/game/server/baseflex.cpp
+++ b/mp/src/game/server/baseflex.cpp
@@ -1318,9 +1318,9 @@ static Activity DetermineExpressionMoveActivity( CChoreoEvent *event, CAI_BaseNP
 
 	// Custom distance styles are appended to param2 with a space as a separator
 	const char *pszAct = Q_strstr( sParam2, " " );
+	char szActName[256];
 	if ( pszAct )
 	{
-		char szActName[256];
 		Q_strncpy( szActName, sParam2, sizeof(szActName) );
 		szActName[ (pszAct-sParam2) ] = '\0';
 		pszAct = szActName;
diff --git a/mp/src/game/server/env_tonemap_controller.cpp b/mp/src/game/server/env_tonemap_controller.cpp
index 807e39ac..613d4548 100644
--- a/mp/src/game/server/env_tonemap_controller.cpp
+++ b/mp/src/game/server/env_tonemap_controller.cpp
@@ -169,7 +169,7 @@ void CEnvTonemapController::InputSetBloomScaleRange( inputdata_t &inputdata )
 		return;
 	}
 	m_flCustomBloomScale=bloom_max;
-	m_flCustomBloomScale=bloom_min;
+	m_flCustomBloomScaleMinimum=bloom_min;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/mp/src/game/server/gameinterface.cpp b/mp/src/game/server/gameinterface.cpp
index c9357138..ff077ea5 100644
--- a/mp/src/game/server/gameinterface.cpp
+++ b/mp/src/game/server/gameinterface.cpp
@@ -1888,9 +1888,13 @@ void CServerGameDLL::SetServerHibernation( bool bHibernating )
 const char *CServerGameDLL::GetServerBrowserMapOverride()
 {
 #ifdef TF_DLL
-	if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() && g_pPopulationManager && g_pPopulationManager->GetPopulationFilenameShort() != '\0' )
+	if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
 	{
-		return g_pPopulationManager->GetPopulationFilenameShort();
+		const char *pszFilenameShort = g_pPopulationManager ? g_pPopulationManager->GetPopulationFilenameShort() : NULL;
+		if ( pszFilenameShort && pszFilenameShort[0] )
+		{
+			return pszFilenameShort;
+		}
 	}
 #endif
 	return NULL;
@@ -2964,17 +2968,20 @@ void CServerGameClients::ClientSetupVisibility( edict_t *pViewEntity, edict_t *p
 	// Flush the remaining areaportal states.
 	engine->SetAreaPortalStates( portalNums, isOpen, iOutPortal );
 
-	// Update the area bits that get sent to the client.
-	pPlayer->m_Local.UpdateAreaBits( pPlayer, portalBits );
+	if ( pPlayer )
+	{
+		// Update the area bits that get sent to the client.
+		pPlayer->m_Local.UpdateAreaBits( pPlayer, portalBits );
 
 #ifdef PORTAL 
-	// *After* the player's view has updated its area bits, add on any other areas seen by portals
-	CPortal_Player* pPortalPlayer = dynamic_cast<CPortal_Player*>( pPlayer );
-	if ( pPortalPlayer )
-	{
-		pPortalPlayer->UpdatePortalViewAreaBits( pvs, pvssize );
-	}
+		// *After* the player's view has updated its area bits, add on any other areas seen by portals
+		CPortal_Player* pPortalPlayer = dynamic_cast<CPortal_Player*>( pPlayer );
+		if ( pPortalPlayer )
+		{
+			pPortalPlayer->UpdatePortalViewAreaBits( pvs, pvssize );
+		}
 #endif //PORTAL
+	}
 }
 
 
diff --git a/mp/src/game/server/hl2/npc_strider.cpp b/mp/src/game/server/hl2/npc_strider.cpp
index b0cb2edf..60d37cdf 100644
--- a/mp/src/game/server/hl2/npc_strider.cpp
+++ b/mp/src/game/server/hl2/npc_strider.cpp
@@ -1130,7 +1130,7 @@ void CNPC_Strider::GatherConditions()
 					   !WeaponLOSCondition( GetAdjustedOrigin(), GetEnemy()->BodyTarget( GetAdjustedOrigin() ), false ) ) )
 				{
 #if 0
-					if ( !HasCondition( COND_STRIDER_SHOULD_CROUCH ) && !HasCondition( COND_STRIDER_SHOULD_CROUCH ) )
+					if ( !HasCondition( COND_STRIDER_SHOULD_CROUCH ) )
 						SetIdealHeight( MIN( GetMaxHeight(), GetHeight() + 75.0 * 0.1 ) ); // default to rising up
 #endif
 					GatherHeightConditions( GetAdjustedOrigin(), GetEnemy() );
@@ -1161,7 +1161,7 @@ void CNPC_Strider::GatherConditions()
 //---------------------------------------------------------
 void CNPC_Strider::GatherHeightConditions( const Vector &vTestPos, CBaseEntity *pEntity )
 {
-	if ( HasCondition( COND_STRIDER_SHOULD_CROUCH ) && HasCondition( COND_STRIDER_SHOULD_CROUCH ) )
+	if ( HasCondition( COND_STRIDER_SHOULD_CROUCH ) )
 		return;
 
 	float maxZ = (GetAbsOrigin().z - (GetMaxHeightModel() - GetMaxHeight()));
diff --git a/mp/src/game/server/player.cpp b/mp/src/game/server/player.cpp
index 73aab6d6..0538f90a 100644
--- a/mp/src/game/server/player.cpp
+++ b/mp/src/game/server/player.cpp
@@ -7409,6 +7409,13 @@ void CBasePlayer::RemoveWearable( CEconWearable *pItem )
 			m_hMyWearables.Remove( i );
 			break;
 		}
+
+		// Integrety is failing, remove NULLs
+		if ( !pWearable )
+		{
+			m_hMyWearables.Remove( i );
+			break;
+		}
 	}
 
 #ifdef DEBUG
diff --git a/mp/src/game/server/props.cpp b/mp/src/game/server/props.cpp
index 4d121d71..648191db 100644
--- a/mp/src/game/server/props.cpp
+++ b/mp/src/game/server/props.cpp
@@ -1517,7 +1517,7 @@ void CBreakableProp::OnPhysGunDrop( CBasePlayer *pPhysGunUser, PhysGunDrop_t Rea
 
 	SetPhysicsAttacker( pPhysGunUser, gpGlobals->curtime );
 
-	if( Reason == PUNTED_BY_CANNON )
+	if( (int)Reason == (int)PUNTED_BY_CANNON )
 	{
 		PlayPuntSound(); 
 	}