Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

SDK sync.

Browse Source
This commit is contained in:
Scott Ehlert
2012-07-06 20:35:59 -05:00
parent 4fb33274fb
commit fdd0bbf277
413 changed files with 67257 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/client/swarm/gameui/swarm/basemodpanel.cpp
View File

@ -1642,7 +1642,7 @@ void CBaseModPanel::OnEvent( KeyValues *pEvent )
}
}
CUIGameData::Get()->OpenWaitScreen( szWaitScreenText, flMinDisplayTime, pSettings );
CUIGameData::Get()->OpenWaitScreen( szWaitScreenText, flMinDisplayTime, pSettings, 7.0f );
}
else if ( !Q_stricmp( "searchresult", szProgress ) )
{

3
game/client/swarm/gameui/swarm/uigamedata.cpp
View File

@ -615,7 +615,7 @@ bool CUIGameData::IsXUIOpen()
return m_bXUIOpen;
}
void CUIGameData::OpenWaitScreen( const char * messageText, float minDisplayTime, KeyValues *pSettings )
void CUIGameData::OpenWaitScreen( const char * messageText, float minDisplayTime, KeyValues *pSettings, float maxDisplayTime )
{
if ( UI_IsDebug() )
{
@ -642,6 +642,7 @@ void CUIGameData::OpenWaitScreen( const char * messageText, float minDisplayTime
waitScreen->SetNavBack( backFrame );
waitScreen->ClearData();
waitScreen->AddMessageText( messageText, minDisplayTime );
waitScreen->SetMaxDisplayTime( maxDisplayTime );
}
}

2
game/client/swarm/gameui/swarm/uigamedata.h
View File

@ -172,7 +172,7 @@ public:
bool IsXUIOpen();
void OpenWaitScreen( const char * messageText, float minDisplayTime = 3.0f, KeyValues *pSettings = NULL );
void OpenWaitScreen( const char * messageText, float minDisplayTime = 3.0f, KeyValues *pSettings = NULL, float maxDisplayTime = 0.0f );
void UpdateWaitPanel( const char * messageText, float minDisplayTime = 3.0f );
void UpdateWaitPanel( const wchar_t * messageText, float minDisplayTime = 3.0f );
void CloseWaitScreen( vgui::Panel * callbackPanel, const char * messageName );

6
game/client/swarm/gameui/swarm/vgenericwaitscreen.cpp
View File

@ -252,7 +252,11 @@ void GenericWaitScreen::CheckIfNeedsToClose()
{
if ( m_MsgStartDisplayTime + m_MsgMaxDisplayTime < time )
{
NavigateBack();
if ( !NavigateBack() )
{
Close();
CBaseModPanel::GetSingleton().OpenFrontScreen();
}
if ( m_pfnMaxTimeOut )
m_pfnMaxTimeOut();

1
game/shared/swarm/asw_gamerules.cpp
View File

@ -167,6 +167,7 @@ ConVar asw_stim_time_scale("asw_stim_time_scale", "0.35", FCVAR_REPLICATED | FCV
ConVar asw_time_scale_delay("asw_time_scale_delay", "0.15", FCVAR_REPLICATED | FCVAR_CHEAT, "Delay before timescale changes to give a chance for the client to comply and predict.");
ConVar asw_ignore_need_two_player_requirement("asw_ignore_need_two_player_requirement", "0", FCVAR_REPLICATED, "If set to 1, ignores the mission setting that states two players are needed to start the mission.");
ConVar mp_gamemode( "mp_gamemode", "campaign", FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY, "Current game mode, acceptable values are campaign and single_mission.", false, 0.0f, false, 0.0f );
ConVar mm_max_players( "mm_max_players", "4", FCVAR_REPLICATED | FCVAR_CHEAT, "Max players for matchmaking system" );
ConVar asw_sentry_friendly_fire_scale( "asw_sentry_friendly_fire_scale", "0", FCVAR_REPLICATED, "Damage scale for sentry gun friendly fire"
#ifdef GAME_DLL
,UpdateMatchmakingTagsCallback );