xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: xutaxkamay:master
Branches Tags
xutaxkamay:master
xutaxkamay:parallax
xutaxkamay:studiomdl_linux
xutaxkamay:triggers-2
xutaxkamay:setupbones-server-fix
xutaxkamay:server-bonesmerge
..
compare: xutaxkamay:parallax
Branches Tags
xutaxkamay:master
xutaxkamay:parallax
xutaxkamay:studiomdl_linux
xutaxkamay:triggers-2
xutaxkamay:setupbones-server-fix
xutaxkamay:server-bonesmerge

No commits in common. "master" and "parallax" have entirely different histories.
master ... parallax

4 changed files with 8 additions and 9 deletions
Show stats Expand all files Collapse all files

13
game/client/c_baseentity.cpp
View file

@ -4320,13 +4320,12 @@ void C_BaseEntity::CalcAbsolutePosition( )
return; return;
} }
// TODO_ENHANCED: this should be safe to remove. // TODO_ENHANCED: this should be safe to remove.
// Not safe to remove this breaks C4 HUD. // if ( IsEffectActive(EF_BONEMERGE) )
if ( IsEffectActive(EF_BONEMERGE) ) // {
{ // MoveToAimEnt();
MoveToAimEnt(); // return;
return; // }
}
// Construct the entity-to-world matrix // Construct the entity-to-world matrix
// Start with making an entity-to-parent matrix // Start with making an entity-to-parent matrix

2
gamedata

@ -1 +1 @@
Subproject commit e5ac8b9a1438977b6998b558f6eb178bd044994c Subproject commit 3b8489243f2611c868dad64b1bbbabd3f32aa874

2
materialsystem/shaderapidx9/vertexshaderdx8.cpp
View file

@ -2058,7 +2058,7 @@ bool CShaderManager::LoadAndCreateShaders_Dynamic( ShaderLookup_t &lookup, bool
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
FileHandle_t CShaderManager::OpenFileAndLoadHeader( const char *pFileName, ShaderHeader_t *pHeader ) FileHandle_t CShaderManager::OpenFileAndLoadHeader( const char *pFileName, ShaderHeader_t *pHeader )
{ {
FileHandle_t fp = g_pFullFileSystem->Open( pFileName, "rb" ); FileHandle_t fp = g_pFullFileSystem->Open( pFileName, "rb", "MOD" );
if ( fp == FILESYSTEM_INVALID_HANDLE ) if ( fp == FILESYSTEM_INVALID_HANDLE )
{ {
return FILESYSTEM_INVALID_HANDLE; return FILESYSTEM_INVALID_HANDLE;

BIN
materialsystem/stdshaders/ShaderCompile.exe Normal file
View file

Binary file not shown.