From 61bc4442c07dc28ea07244844fdd5c036037babd Mon Sep 17 00:00:00 2001 From: q3rally Date: Thu, 18 Feb 2021 17:57:20 +0000 Subject: [PATCH] fixed incorrect shaders for lightning gun and railgun --- baseq3r/scripts/weapons.shader | 25 +++++++++++++++++++++---- engine/code/qcommon/q_shared.h | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/baseq3r/scripts/weapons.shader b/baseq3r/scripts/weapons.shader index f69fe52d..d9aa42c2 100644 --- a/baseq3r/scripts/weapons.shader +++ b/baseq3r/scripts/weapons.shader @@ -231,6 +231,23 @@ lightningBoltNewNPM } } +lightnnFlash +{ + cull disable + { + clampmap models/weapons2/lightning/muzzle1.tga + blendfunc add + rgbGen entity + tcMod rotate -74 + } + { + clampmap models/weapons2/lightning/muzzle1.tga + blendfunc add + rgbGen entity + tcMod rotate 53 + } +} + // ------------------------------------------------------------ // 3.Flamethrower // ------------------------------------------------------------ @@ -894,17 +911,17 @@ models/weapons2/railgun/glass } } -railgunFlash +lowRailgunFlash { cull disable { - clampmap models/weapons2/railgun/f_railgun2.tga + clampmap models/weapons2/railgun/f_railgun2.jpg blendfunc add rgbGen entity tcMod rotate -74 } { - clampmap models/weapons2/railgun/f_railgun2.tga + clampmap models/weapons2/railgun/f_railgun2.jpg blendfunc add rgbGen entity tcMod rotate 53 @@ -915,7 +932,7 @@ railDisc { cull disable { - clampmap models/weapons2/railgun/f_railgun3.tga + clampmap models/weapons2/railgun/f_railgun3.jpg blendfunc add rgbGen vertex tcmod rotate 130 diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index c502f5c5..b93382d6 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.3.0_r291" +#define PRODUCT_VERSION "v0.0.3.0_r292" #endif