diff --git a/engine/cmd.cpp b/engine/cmd.cpp index 20beda09..783ded93 100644 --- a/engine/cmd.cpp +++ b/engine/cmd.cpp @@ -579,7 +579,7 @@ void Cmd_Exec_f( const CCommand &args ) const char *szFile = args[1]; - const char *pPathID = "MOD"; + const char *pPathID = "*"; Q_snprintf( fileName, sizeof( fileName ), "//%s/cfg/%s", pPathID, szFile ); Q_DefaultExtension( fileName, ".cfg", sizeof( fileName ) ); diff --git a/game/shared/cstrike/achievements_cs.cpp b/game/shared/cstrike/achievements_cs.cpp index 9996589d..7bfbe378 100644 --- a/game/shared/cstrike/achievements_cs.cpp +++ b/game/shared/cstrike/achievements_cs.cpp @@ -26,7 +26,7 @@ // [dwenger] Necessary for sorting achievements by award time #include -#include "../../src/public/vgui_controls/Controls.h" +#include "vgui_controls/Controls.h" ConVar achievements_easymode( "achievement_easymode", "0", FCVAR_CLIENTDLL | FCVAR_DEVELOPMENTONLY, diff --git a/gameui/BasePanel.cpp b/gameui/BasePanel.cpp index 16e75081..73b084d0 100644 --- a/gameui/BasePanel.cpp +++ b/gameui/BasePanel.cpp @@ -657,7 +657,7 @@ bool g_bIsCreatingNewGameMenuForPreFetching = false; // Purpose: Constructor //----------------------------------------------------------------------------- CBasePanel::CBasePanel() : Panel(NULL, "BaseGameUIPanel") -{ +{ g_pBasePanel = this; m_bLevelLoading = false; m_eBackgroundState = BACKGROUND_INITIAL; @@ -863,6 +863,7 @@ CBasePanel::~CBasePanel() static const char *g_rgValidCommands[] = { "OpenGameMenu", + "OpenConsole", "OpenPlayerListDialog", "OpenNewGameDialog", "OpenLoadGameDialog", @@ -1477,6 +1478,8 @@ CGameMenu *CBasePanel::RecursiveLoadGameMenu(KeyValues *datafile) { CGameMenu *menu = new CGameMenu(this, datafile->GetName()); + menu->AddMenuItem("Console", "CONSOLE", "OpenConsole", this); + // loop through all the data adding items to the menu for (KeyValues *dat = datafile->GetFirstSubKey(); dat != NULL; dat = dat->GetNextKey()) { @@ -1899,6 +1902,10 @@ void CBasePanel::RunMenuCommand(const char *command) { OnOpenNewGameDialog(); } + else if ( !Q_stricmp( command, "OpenConsole" ) ) + { + GameConsole().Activate(); + } else if ( !Q_stricmp( command, "OpenLoadGameDialog" ) ) { if ( !GameUI().IsConsoleUI() ) diff --git a/public/togles/linuxwin/glfuncs.h b/public/togles/linuxwin/glfuncs.h index 39dfdc87..37f7e284 100644 --- a/public/togles/linuxwin/glfuncs.h +++ b/public/togles/linuxwin/glfuncs.h @@ -249,3 +249,4 @@ GL_FUNC_VOID(OpenGL,true,glSamplerParameterfv,(GLuint a, GLenum b, const GLfloat GL_FUNC_VOID(GL_QCOM_alpha_test,false,glAlphaFuncQCOM,(GLenum a, GLfloat b),(a,b)) GL_FUNC_VOID(OpenGL,true,glClearDepthf,(GLfloat a),(a)) GL_FUNC_VOID(OpenGL,true,glDepthRangef,(GLfloat a,GLfloat b),(a,b)) +GL_FUNC_VOID(OpenGL,true,glGetFramebufferAttachmentParameteriv,(GLenum a,GLenum b,GLenum c,GLint *d),(a,b,c,d)) diff --git a/public/togles/linuxwin/glmgr.h b/public/togles/linuxwin/glmgr.h index d3179776..40ae90f2 100644 --- a/public/togles/linuxwin/glmgr.h +++ b/public/togles/linuxwin/glmgr.h @@ -731,16 +731,16 @@ FORCEINLINE void GLContextSet( GLBlendEnableSRGB_t *src ) } #endif // this query is not useful unless you have the ARB_framebuffer_srgb ext. - //GLint encoding = 0; - //pfnglGetFramebufferAttachmentParameteriv( GL_DRAW_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, &encoding ); +// GLint encoding = 0; +// gGL->glGetFramebufferAttachmentParameteriv( GL_DRAW_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, &encoding ); glSetEnable( GL_FRAMEBUFFER_SRGB_EXT, src->enable != 0 ); } FORCEINLINE void GLContextGet( GLBlendEnableSRGB_t *dst ) { - dst->enable = gGL->glIsEnabled( GL_FRAMEBUFFER_SRGB_EXT ); -// dst->enable = true; // wtf ? +// dst->enable = gGL->glIsEnabled( GL_FRAMEBUFFER_SRGB_EXT ); + dst->enable = true; // wtf ? } FORCEINLINE void GLContextGetDefault( GLBlendEnableSRGB_t *dst ) diff --git a/togles/linuxwin/dx9asmtogl2.cpp b/togles/linuxwin/dx9asmtogl2.cpp index f97d2e7f..e8e6abe2 100644 --- a/togles/linuxwin/dx9asmtogl2.cpp +++ b/togles/linuxwin/dx9asmtogl2.cpp @@ -3186,10 +3186,9 @@ int D3DToGL::TranslateShader( uint32* code, CUtlBuffer *pBufDisassembledCode, bo m_bPutHexCodesAfterLines = (options & D3DToGL_PutHexCommentsAfterLines) != 0; m_bGeneratingDebugText = (options & D3DToGL_GeneratingDebugText) != 0; m_bGenerateSRGBWriteSuffix = (options & D3DToGL_OptionSRGBWriteSuffix) != 0; - m_bGenerateSRGBWriteSuffix = false; - if( debugLabel && (V_strstr( debugLabel ,"vertexlit_and_unlit_generic_ps") || V_strstr( debugLabel ,"vertexlit_and_unlit_generic_bump_ps") ) ) - m_bGenerateSRGBWriteSuffix = true; +/* if( debugLabel && (V_strstr( debugLabel ,"vertexlit_and_unlit_generic_ps") || V_strstr( debugLabel ,"vertexlit_and_unlit_generic_bump_ps") ) ) + m_bGenerateSRGBWriteSuffix = true;*/ m_NumIndentTabs = 1; // start code indented one tab m_nLoopDepth = 0; @@ -3921,11 +3920,11 @@ int D3DToGL::TranslateShader( uint32* code, CUtlBuffer *pBufDisassembledCode, bo // sRGB Write suffix if ( m_bGenerateSRGBWriteSuffix ) { - // StrcatToALUCode( "vec3 sRGBFragData;\n" ); - // StrcatToALUCode( "sRGBFragData.xyz = log( gl_FragData[0].xyz );\n" ); - // StrcatToALUCode( "sRGBFragData.xyz = sRGBFragData.xyz * vec3( 0.754545f, 0.754545f, 0.754545f );\n" ); - // StrcatToALUCode( "sRGBFragData.xyz = exp( sRGBFragData.xyz );\n" ); - StrcatToALUCode( "gl_FragData[0].xyz = pow(gl_FragData[0].xyz, vec3(1.0/2.2));\n" ); + StrcatToALUCode( "vec3 sRGBFragData;\n" ); + StrcatToALUCode( "sRGBFragData.xyz = log( gl_FragData[0].xyz );\n" ); + StrcatToALUCode( "sRGBFragData.xyz = sRGBFragData.xyz * vec3( 0.454545f, 0.454545f, 0.454545f );\n" ); + StrcatToALUCode( "sRGBFragData.xyz = exp( sRGBFragData.xyz );\n" ); + StrcatToALUCode( "gl_FragData[0].xyz = mix( gl_FragData[0].xyz, sRGBFragData, flSRGBWrite );\n" ); } if( m_iFragDataCount && bVertexShader ) diff --git a/togles/linuxwin/dxabstract.cpp b/togles/linuxwin/dxabstract.cpp index 84d6a3f3..5b341395 100644 --- a/togles/linuxwin/dxabstract.cpp +++ b/togles/linuxwin/dxabstract.cpp @@ -1201,8 +1201,8 @@ static void FillD3DCaps9( const GLMRendererInfoFields &glmRendererInfo, D3DCAPS9 pCaps->MaxPixelShader30InstructionSlots = 0; #if DX_TO_GL_ABSTRACTION - pCaps->FakeSRGBWrite = !glmRendererInfo.m_hasGammaWrites; - pCaps->CanDoSRGBReadFromRTs = !glmRendererInfo.m_cantAttachSRGB; + pCaps->FakeSRGBWrite = true;//!glmRendererInfo.m_hasGammaWrites; + pCaps->CanDoSRGBReadFromRTs = true;//!glmRendererInfo.m_cantAttachSRGB; pCaps->MixedSizeTargets = glmRendererInfo.m_hasMixedAttachmentSizes; #endif }