diff --git a/Source/gs-entbase/client/env_glow.cpp b/Source/gs-entbase/client/env_glow.cpp index a9b22930..7089e832 100644 --- a/Source/gs-entbase/client/env_glow.cpp +++ b/Source/gs-entbase/client/env_glow.cpp @@ -56,7 +56,7 @@ float env_glow::predraw(void) R_EndPolygon(); addentity(this); } - + return PREDRAW_NEXT; } diff --git a/Source/math.h b/Source/math.h index 5f36993c..db8d40a2 100755 --- a/Source/math.h +++ b/Source/math.h @@ -91,6 +91,11 @@ void QPhysics_Run ( entity eTarget ) PMove_Run(); #ifdef SSQC + + if (self.waterlevel != 0) { + flFallVel = 0; + } + if ( ( self.flags & FL_ONGROUND ) && self.movetype == MOVETYPE_WALK && ( flFallVel > 580 )) { float fFallDamage = ( flFallVel - 580 ) * ( 100 / ( 1024 - 580 ) ); Damage_Apply( self, world, fFallDamage, self.origin, FALSE ); diff --git a/cstrike/data.pk3dir/progs.dat b/cstrike/data.pk3dir/progs.dat index d7d1677b..86d5262d 100644 Binary files a/cstrike/data.pk3dir/progs.dat and b/cstrike/data.pk3dir/progs.dat differ diff --git a/rewolf/data.pk3dir/progs.dat b/rewolf/data.pk3dir/progs.dat index 1e7455cb..00a27ab5 100644 Binary files a/rewolf/data.pk3dir/progs.dat and b/rewolf/data.pk3dir/progs.dat differ diff --git a/scihunt/data.pk3dir/progs.dat b/scihunt/data.pk3dir/progs.dat index 25128385..4ddd2ca9 100644 Binary files a/scihunt/data.pk3dir/progs.dat and b/scihunt/data.pk3dir/progs.dat differ diff --git a/valve/data.pk3dir/particles/default.cfg b/valve/data.pk3dir/particles/default.cfg index bdb0b69d..6624a082 100755 --- a/valve/data.pk3dir/particles/default.cfg +++ b/valve/data.pk3dir/particles/default.cfg @@ -4,7 +4,7 @@ r_part part_spark texture ball tcoords 1 65 31 95 256 8 32 scale 1 - count 4 + count 8 scalefactor 1 alpha 0.5 die 0.8 @@ -14,7 +14,7 @@ r_part part_spark spawnorg 1 spawnvel 100 veladd 100 - friction 0.3 + friction 0.5 gravity 800 } @@ -23,7 +23,7 @@ r_part part_pieces_black type ball texture ball tcoords 1 65 31 95 256 8 32 - scale 2 + scale 4 count 18 scalefactor 1 alpha 1 @@ -198,4 +198,4 @@ r_part smokegren gravity -25 veladd -20 randomvel 64 -64 -} \ No newline at end of file +} diff --git a/valve/data.pk3dir/progs.dat b/valve/data.pk3dir/progs.dat index 710298c7..3b33da73 100644 Binary files a/valve/data.pk3dir/progs.dat and b/valve/data.pk3dir/progs.dat differ