Merge remote-tracking branch 'ValveSoftware/master' into mapbase-mp-2025

Author: azzyr

game/mod_tf/gameinfo.txt

@@ -32,15 +32,16 @@
 			// folder.
 			//
 			// Note that this folder is scanned only when the game is booted.
-			game+mod	mod_tf/custom/*
+			game+mod+custom_mod	mod_tf/custom/*
 			// Enable this if you want to load your TF custom content.
-			//game+mod	|appid_440|tf/custom/*
+			//game+mod+custom_mod	|appid_440|tf/custom/*
 
 			// Now search loose files.  We'll set the directory containing the gameinfo.txt file
 			// as the first "mod" search path (after any user customizations).  This is also the one
 			// that's used when writing to the "mod" path.
 			mod+mod_write		|gameinfo_path|.
 			game+game_write		|gameinfo_path|.
+			vgui				|gameinfo_path|.
 			default_write_path	|gameinfo_path|.
 			gamebin				|gameinfo_path|bin
 

src/common/ServerBrowser/blacklisted_server_manager.cpp

@@ -43,7 +43,7 @@ void CBlacklistedServerManager::Reset( void )
 //-----------------------------------------------------------------------------
 int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, bool bResetTimes )
 {
-	KeyValues *pKV = new KeyValues( "serverblacklist" );
+	KeyValuesAD pKV( "serverblacklist" );
 	if ( !pKV->LoadFromFile( g_pFullFileSystem, pszFilename, "MOD" ) )
 		return 0;
 
@@ -75,8 +75,6 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
 		}
 	}
 
-	pKV->deleteThis();
-
 	return count;
 }
 

src/game/client/c_baseentity.cpp

@@ -614,6 +614,7 @@ BEGIN_RECV_TABLE_NOBASE(C_BaseEntity, DT_BaseEntity)
 #endif
 	RecvPropInt(RECVINFO(m_iTeamNum)),
 	RecvPropInt(RECVINFO(m_CollisionGroup)),
+	RecvPropFloat(RECVINFO(m_flGravity)),
 	RecvPropFloat(RECVINFO(m_flElasticity)),
 	RecvPropFloat(RECVINFO(m_flShadowCastDistance)),
 	RecvPropEHandle( RECVINFO(m_hOwnerEntity) ),
@@ -698,7 +699,7 @@ BEGIN_PREDICTION_DATA_NO_BASE( C_BaseEntity )
 //	DEFINE_FIELD( m_flLastMessageTime, FIELD_FLOAT ),
 	DEFINE_FIELD( m_vecBaseVelocity, FIELD_VECTOR ),
 	DEFINE_FIELD( m_iEFlags, FIELD_INTEGER ),
-	DEFINE_FIELD( m_flGravity, FIELD_FLOAT ),
+	DEFINE_PRED_FIELD( m_flGravity, FIELD_FLOAT, FTYPEDESC_INSENDTABLE | FTYPEDESC_NOERRORCHECK ),
 //	DEFINE_FIELD( m_ModelInstance, FIELD_SHORT ),
 	DEFINE_FIELD( m_flProxyRandomValue, FIELD_FLOAT ),
 

src/game/client/c_baseplayer.cpp

@@ -476,6 +476,9 @@ LINK_ENTITY_TO_CLASS( player, C_BasePlayer );
 C_BasePlayer::C_BasePlayer() : m_iv_vecViewOffset( "C_BasePlayer::m_iv_vecViewOffset" )
 {
 	AddVar( &m_vecViewOffset, &m_iv_vecViewOffset, LATCH_SIMULATION_VAR );
+
+	AddVar( &m_Local.m_vecPunchAngle, &m_Local.m_iv_vecPunchAngle, LATCH_SIMULATION_VAR );
+	AddVar( &m_Local.m_vecPunchAngleVel, &m_Local.m_iv_vecPunchAngleVel, LATCH_SIMULATION_VAR );
 
 #ifdef _DEBUG																
 	m_vecLadderNormal.Init();

src/game/client/c_baseviewmodel.cpp

@@ -19,6 +19,7 @@
 #include <KeyValues.h>
 #include "hltvcamera.h"
 #ifdef TF_CLIENT_DLL
+	#include "c_tf_player.h"
 	#include "tf_weaponbase.h"
 #endif
 
@@ -91,6 +92,22 @@ void FormatViewModelAttachment( Vector &vOrigin, bool bInverse )
 	vOrigin = pViewSetup->origin + vOut;
 }
 
+#ifdef TF_CLIENT_DLL
+bool TeamFortress_ShouldFlipClientViewModel( void )
+{
+	if ( IsLocalPlayerSpectator() )
+	{
+		// Use spectated client's handedness preference
+		C_TFPlayer *pSpecTarget = ToTFPlayer( UTIL_PlayerByIndex( GetSpectatorTarget() ) );
+		if ( pSpecTarget )
+		{
+			return pSpecTarget->m_bFlipViewModels;
+		}
+	}
+
+	return cl_flipviewmodels.GetBool();
+}
+#endif //TF_CLIENT_DLL
 
 void C_BaseViewModel::FormatViewModelAttachment( int nAttachment, matrix3x4_t &attachmentToWorld )
 {
@@ -211,7 +228,7 @@ bool C_BaseViewModel::ShouldFlipViewModel()
 	CBaseCombatWeapon *pWeapon = m_hWeapon.Get();
 	if ( pWeapon )
 	{
-		return pWeapon->m_bFlipViewModel != cl_flipviewmodels.GetBool();
+		return pWeapon->m_bFlipViewModel != TeamFortress_ShouldFlipClientViewModel();
 	}
 #endif
 

src/game/client/c_baseviewmodel.h

@@ -16,4 +16,8 @@
 #include "utlvector.h"
 #include "baseviewmodel_shared.h"
 
+#ifdef TF_CLIENT_DLL
+bool TeamFortress_ShouldFlipClientViewModel( void );
+#endif //TF_CLIENT_DLL
+
 #endif // C_BASEVIEWMODEL_H

src/game/client/econ/base_loadout_panel.cpp

@@ -19,6 +19,7 @@
 #include "vgui_controls/ComboBox.h"
 #include "vgui/IInput.h"
 #include "econ_ui.h"
+#include "c_tf_player.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include <tier0/memdbgon.h>
@@ -265,8 +266,9 @@ void CBaseLoadoutPanel::ShowPanel( int iClass, bool bBackpack, bool bReturningFr
 		UpdateModelPanels();
 
 		// make the first slot be selected so controller input will work
-		static ConVarRef joystick( "joystick" );
-		if( joystick.IsValid() && joystick.GetBool() && m_pItemModelPanels.Count() && m_pItemModelPanels[0] )
+		//static ConVarRef joystick( "joystick" );
+		bool bSteamController = ::input->IsSteamControllerActive();
+		if( bSteamController && m_pItemModelPanels.Count() && m_pItemModelPanels[0] )
 		{
 			m_pItemModelPanels[0]->SetSelected( true );
 			m_pItemModelPanels[0]->RequestFocus();
@@ -678,6 +680,7 @@ bool	CBaseLoadoutPanel::HandleItemSelectionKeyPressed( vgui::KeyCode code )
 	if ( nButtonCode == KEY_XBUTTON_UP || 
 			  nButtonCode == KEY_XSTICK1_UP ||
 			  nButtonCode == KEY_XSTICK2_UP || 
+			  nButtonCode == STEAMCONTROLLER_DPAD_UP ||
 			  nButtonCode == KEY_UP )
 	{
 		SelectAdjacentItem( 0, -1 );
@@ -730,7 +733,7 @@ bool	CBaseLoadoutPanel::HandleItemSelectionKeyPressed( vgui::KeyCode code )
 		}
 		return true;
 	}
-	else if ( nButtonCode == KEY_XBUTTON_Y )
+	else if ( nButtonCode == KEY_XBUTTON_Y || nButtonCode == STEAMCONTROLLER_Y )
 	{
 		m_bTooltipKeyPressed = true;
 		CItemModelPanel *pSelection = GetFirstSelectedItemModelPanel( false );
@@ -754,7 +757,7 @@ bool	CBaseLoadoutPanel::HandleItemSelectionKeyPressed( vgui::KeyCode code )
 bool	CBaseLoadoutPanel::HandleItemSelectionKeyReleased( vgui::KeyCode code ) 
 {
 	ButtonCode_t nButtonCode = GetBaseButtonCode( code );
-	if( nButtonCode == KEY_XBUTTON_Y )
+	if( nButtonCode == KEY_XBUTTON_Y || nButtonCode == STEAMCONTROLLER_Y )
 	{
 		m_bTooltipKeyPressed = false;
 		m_pMouseOverTooltip->HideTooltip();

src/game/client/econ/econ_controls.cpp

@@ -1910,14 +1910,15 @@ void CExplanationPopup::OnKeyCodePressed( vgui::KeyCode code )
 		ButtonCode_t nButtonCode = GetBaseButtonCode( code );
 
 		// swallow all keys
-		if ( nButtonCode == KEY_XBUTTON_B )
+		if ( nButtonCode == KEY_XBUTTON_B || nButtonCode == STEAMCONTROLLER_B )
 		{
 			OnCommand( "close" );
 			return;
 		}
 		else if ( nButtonCode == KEY_XBUTTON_LEFT || 
 				  nButtonCode == KEY_XSTICK1_LEFT ||
 				  nButtonCode == KEY_XSTICK2_LEFT ||
+				  nButtonCode == STEAMCONTROLLER_DPAD_LEFT ||
 				  code == KEY_LEFT )
 		{
 			OnCommand( "prevexplanation" );
@@ -1926,6 +1927,7 @@ void CExplanationPopup::OnKeyCodePressed( vgui::KeyCode code )
 		else if ( nButtonCode == KEY_XBUTTON_RIGHT || 
 				  nButtonCode == KEY_XSTICK1_RIGHT ||
 				  nButtonCode == KEY_XSTICK2_RIGHT ||
+				  nButtonCode == STEAMCONTROLLER_DPAD_RIGHT ||
 				  code == KEY_RIGHT )
 		{
 			OnCommand( "nextexplanation" );

src/game/client/econ/item_pickup_panel.cpp

@@ -473,13 +473,15 @@ void	CItemPickupPanel::OnKeyCodePressed( vgui::KeyCode code )
 	else if ( nButtonCode == KEY_XBUTTON_RIGHT || 
 			  nButtonCode == KEY_XSTICK1_RIGHT ||
 			  nButtonCode == KEY_XSTICK2_RIGHT || 
+			  nButtonCode == STEAMCONTROLLER_DPAD_RIGHT ||
 			  nButtonCode == KEY_RIGHT )
 	{
 		OnCommand( "nextitem" );
 	}
 	else if ( nButtonCode == KEY_XBUTTON_LEFT || 
 			  nButtonCode == KEY_XSTICK1_LEFT ||
 			  nButtonCode == KEY_XSTICK2_LEFT || 
+			  nButtonCode == STEAMCONTROLLER_DPAD_LEFT ||
 			  nButtonCode == KEY_LEFT )
 	{
 		OnCommand( "previtem" );
@@ -848,7 +850,7 @@ void	CItemDiscardPanel::OnKeyCodePressed( vgui::KeyCode code )
 {	
 	ButtonCode_t nButtonCode = GetBaseButtonCode( code );
 
-	if( nButtonCode == KEY_XBUTTON_B )
+	if( nButtonCode == KEY_XBUTTON_B || nButtonCode == STEAMCONTROLLER_B )
 	{
 		OnCommand( "vguicancel" );
 	}

src/game/client/econ/item_selection_panel.cpp

@@ -378,9 +378,10 @@ void CItemSelectionPanel::OnKeyCodePressed( vgui::KeyCode code )
 			NotifySelectionReturned( pItemPanel );
 		}
 	}
-	else if( nButtonCode == KEY_XBUTTON_B )
+	else if( nButtonCode == KEY_XBUTTON_B || nButtonCode == STEAMCONTROLLER_B )
 	{
-		PostMessageSelectionReturned( INVALID_ITEM_ID );
+		//match the same behaviour as pressing ESC
+		PostMessageSelectionReturned( 0 );
 		OnClose();
 	}
 	else
@@ -1085,8 +1086,9 @@ void CEquipSlotItemSelectionPanel::UpdateModelPanelsForSelection( void )
 	int nPageStart = GetCurrentPage() * GetNumSlotsPerPage();
 	nOldSelection += nPageStart;
 
-	static ConVarRef joystick( "joystick" );
-	if ( joystick.IsValid() && joystick.GetBool() )
+	//static ConVarRef joystick( "joystick" );
+	bool bSteamController = ::input->IsSteamControllerActive();
+	if ( bSteamController )
 	{
 		if( nOldSelection == -1 || nOldSelection >= vecDisplayItems.Count() )
 			nOldSelection = nPageStart;
@@ -1102,7 +1104,7 @@ void CEquipSlotItemSelectionPanel::UpdateModelPanelsForSelection( void )
 		m_pItemModelPanels[i]->SetShowGreyedOutTooltip( true );
 		m_pItemModelPanels[i]->SetGreyedOut( NULL );
 		m_pItemModelPanels[i]->SetNoItemText( "#SelectNoItemSlot" );
-		bool bSelected = joystick.IsValid() && joystick.GetBool() && iItemIndex == nOldSelection;
+		bool bSelected = bSteamController && iItemIndex == nOldSelection;
 		m_pItemModelPanels[i]->SetSelected( bSelected );
 		m_pItemModelPanels[i]->SetShowQuantity( true );
 		m_pItemModelPanels[i]->SetForceShowEquipped( false );