*         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.
This commit is contained in:
Joe Ludwig
2014-05-15 13:59:18 -07:00
parent 7309a5f13f
commit 53e78c503e
360 changed files with 4720 additions and 1689 deletions

View File

@@ -2079,7 +2079,12 @@ void CClientHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser,
{
CHTMLProtoBufMsg<CMsgFinishedRequest> cmd( eHTMLCommands_FinishedRequest );
cmd.Body().set_url( CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() );
if ( browser->GetMainFrame()->GetURL().size() > 0 )
cmd.Body().set_url( CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() );
else
cmd.Body().set_url( "" );
CefString frameName = browser->GetMainFrame()->GetName();
if ( !frameName.empty() )
cmd.Body().set_pagetitle( frameName.c_str() );
@@ -2221,6 +2226,9 @@ bool CClientHandler::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefResponse> response,
int loadFlags)
{
if ( request->GetURL().size() == 0 )
return false;
CHTMLProtoBufMsg<CMsgLoadingResource> cmd( eHTMLCommands_LoadingResource );
cmd.Body().set_url( CStrAutoEncode( request->GetURL().c_str() ).ToString() );
DISPATCH_MESSAGE( eHTMLCommands_LoadingResource );
@@ -3022,42 +3030,43 @@ void CClientHandler::RequestScreenShot( const CHTMLProtoBufMsg<CMsgSavePageToJPE
//-----------------------------------------------------------------------------
void CClientHandler::SavePageToJPEGIfNeeded( CefRefPtr<CefBrowser> browser, const byte *pRGBA, int wide, int tall )
{
if ( m_Snapshot.m_sURLSnapshot.IsValid() && wide && tall
&& m_Snapshot.m_sURLSnapshot == CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() )
if ( m_Snapshot.m_sURLSnapshot.IsValid() && wide && tall && ( browser->GetMainFrame()->GetURL().size() > 0 ) )
{
VPROF_BUDGET( "CClientHandler::SavePageToJPEGIfNeeded", VPROF_BUDGETGROUP_TENFOOT );
CUtlBuffer bufRGB;
bufRGB.Put( pRGBA, wide * tall *4 );
if ( !BConvertRGBAToRGB( bufRGB, wide, tall ) )
return;
BResizeImageRGB( bufRGB, wide, tall, m_Snapshot.m_nWide, m_Snapshot.m_nTall );
// input format is actually BGRA so now swizzle to rgb
byte *pBGR = (byte *)bufRGB.Base();
for ( int i = 0; i < m_Snapshot.m_nTall; i++ )
if ( m_Snapshot.m_sURLSnapshot == CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() )
{
for ( int j = 0; j < m_Snapshot.m_nWide; j++ )
VPROF_BUDGET( "CClientHandler::SavePageToJPEGIfNeeded", VPROF_BUDGETGROUP_TENFOOT );
CUtlBuffer bufRGB;
bufRGB.Put( pRGBA, wide * tall *4 );
if ( !BConvertRGBAToRGB( bufRGB, wide, tall ) )
return;
BResizeImageRGB( bufRGB, wide, tall, m_Snapshot.m_nWide, m_Snapshot.m_nTall );
// input format is actually BGRA so now swizzle to rgb
byte *pBGR = (byte *)bufRGB.Base();
for ( int i = 0; i < m_Snapshot.m_nTall; i++ )
{
char cR = pBGR[0];
pBGR[0] = pBGR[2];
pBGR[2] = cR;
pBGR += 3;
for ( int j = 0; j < m_Snapshot.m_nWide; j++ )
{
char cR = pBGR[0];
pBGR[0] = pBGR[2];
pBGR[2] = cR;
pBGR += 3;
}
}
}
if ( !ConvertRGBToJpeg( m_Snapshot.m_sFileNameSnapshot, k_ScreenshotQuality, m_Snapshot.m_nWide, m_Snapshot.m_nTall, bufRGB ) )
return;
if ( !ConvertRGBToJpeg( m_Snapshot.m_sFileNameSnapshot, k_ScreenshotQuality, m_Snapshot.m_nWide, m_Snapshot.m_nTall, bufRGB ) )
return;
CHTMLProtoBufMsg<CMsgSavePageToJPEGResponse> cmd( eHTMLCommands_SavePageToJPEGResponse );
cmd.Body().set_url( m_Snapshot.m_sURLSnapshot );
cmd.Body().set_filename( m_Snapshot.m_sFileNameSnapshot );
DISPATCH_MESSAGE( eHTMLCommands_SavePageToJPEGResponse );
m_Snapshot.m_sURLSnapshot.Clear();
m_Snapshot.m_flRequestTimeout = 0.0f;
CHTMLProtoBufMsg<CMsgSavePageToJPEGResponse> cmd( eHTMLCommands_SavePageToJPEGResponse );
cmd.Body().set_url( m_Snapshot.m_sURLSnapshot );
cmd.Body().set_filename( m_Snapshot.m_sFileNameSnapshot );
DISPATCH_MESSAGE( eHTMLCommands_SavePageToJPEGResponse );
m_Snapshot.m_sURLSnapshot.Clear();
m_Snapshot.m_flRequestTimeout = 0.0f;
}
}
}

View File

@@ -3911,7 +3911,7 @@ void Panel::PinToSibling( const char *pszSibling, PinCorner_e pinOurCorner, PinC
_pinCornerToSibling = pinOurCorner;
_pinToSiblingCorner = pinSibling;
if ( _pinToSibling && pszSibling && !Q_strcmp( _pinToSibling, pszSibling ) )
if ( m_pinSibling.Get() && _pinToSibling && pszSibling && !Q_strcmp( _pinToSibling, pszSibling ) )
return;
if (_pinToSibling)

View File

@@ -24,6 +24,8 @@
using namespace vgui;
DECLARE_BUILD_FACTORY( PanelListPanel );
//-----------------------------------------------------------------------------
// Purpose: Constructor
//-----------------------------------------------------------------------------
@@ -135,7 +137,7 @@ Panel *PanelListPanel::GetCellRenderer( int row )
// data->GetName() is used to uniquely identify an item
// data sub items are matched against column header name to be used in the table
//-----------------------------------------------------------------------------
int PanelListPanel::AddItem( Panel *labelPanel, Panel *panel)
int PanelListPanel::AddItem( Panel *labelPanel, Panel *panel )
{
Assert(panel);

View File

@@ -115,7 +115,7 @@ void RadioButton::ApplySchemeSettings(IScheme *pScheme)
SetContentAlignment(a_west);
// reloading the scheme wipes out lists of images
_radioBoxImage->SetFont( pScheme->GetFont("Marlett", IsProportional()) );
_radioBoxImage->SetFont( pScheme->GetFont("MarlettSmall", IsProportional()) );
_radioBoxImage->ResizeImageToContent();
SetImageAtIndex(0, _radioBoxImage, 0);

View File

@@ -1637,7 +1637,7 @@ void TextEntry::OnKeyCodePressed(KeyCode code)
// Pass on the joystick and mouse codes
if ( IsMouseCode(code) || IsNovintButtonCode(code) || IsJoystickCode(code) || IsJoystickButtonCode(code) ||
IsJoystickPOVCode(code) || IsJoystickPOVCode(code) || IsJoystickAxisCode(code) )
IsJoystickPOVCode(code) || IsJoystickAxisCode(code) )
{
Panel::OnKeyCodePressed( code );
return;