Merge branch 'master' into terencehill/glowmod_color_fix

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 3adef84a4b5c72299ba8f8c5889013c0bd145833..6a31b85bc5e8af537364f41b5e6c4d4deeacb7ce 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -300,7 +300,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 
        // GLOWMOD AND DEATH FADING
        if(this.colormap > 0)
-               this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2;
+               this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true);
        else
                this.glowmod = '1 1 1';
 

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 6e4903f4d9648598df27fea9104ef81e3a7d5754..a8cdcf90c5724877f25a045e16dcb25800eeaae4 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -276,7 +276,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
                // TODO: projectiles use glowmaps for their color, not teams
                #if 0
                if(this.colormap > 0)
-                       this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true) * 2;
+                       this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true);
                else
                        this.glowmod = '1 1 1';
                #endif

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 84812fc4605cb2d34fb8497b975e1b9b7d6bafa3..5c309ece8012806f50245ee1583f6d991c880cbe 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -10,7 +10,7 @@ void turret_remove(entity this)
 .vector glowmod;
 void turret_changeteam(entity this)
 {
-       this.glowmod = Team_ColorRGB(this.team - 1) * 2;
+       this.glowmod = Team_ColorRGB(this.team - 1);
        this.teamradar_color = Team_ColorRGB(this.team - 1);
 
        if(this.team)

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 2a7ed0bebbc46a8764d35722b3b0a4cce05d70b0..6e63832d3c9433d0bbe030fd70b7fb543aab3e4b 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -347,7 +347,7 @@ STATIC_INIT(register_weapons_done)
 vector weaponentity_glowmod(Weapon wep, entity actor, int c, entity wepent)
 {
     vector g;
-    if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true) * 2;
+    if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true);
     return g;
 }
 

diff --git a/textures/erebusfullbright_glow.tga b/textures/erebusfullbright_glow.tga
index a91959d3663f7d20ae2a3d6c6bdccc43ea360eff..588569f6dd418f009dfeffd34f8960d764aa52ec 100644 (file)
Binary files a/textures/erebusfullbright_glow.tga and b/textures/erebusfullbright_glow.tga differ

diff --git a/textures/gakarmorfb_glow.tga b/textures/gakarmorfb_glow.tga
index e506ce05fd994bbf6242ced5a9fb56485eff5a46..dd873f7d87f0b2c8c3ec186f12ab650c47a13ba8 100644 (file)
Binary files a/textures/gakarmorfb_glow.tga and b/textures/gakarmorfb_glow.tga differ

diff --git a/textures/gakarmorfb_shirt.tga b/textures/gakarmorfb_shirt.tga
index ce4b6d6d3fb4f847b8e4fd65e178b8df5ad4d6bf..6bd287d143cfc0f63ef3be5c3e6e3ced0bb2218a 100644 (file)
Binary files a/textures/gakarmorfb_shirt.tga and b/textures/gakarmorfb_shirt.tga differ

diff --git a/textures/gakfullbright_shirt.tga b/textures/gakfullbright_shirt.tga
index 4f9d05336f56564c68ea9dbdd9fc81851589a681..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/gakfullbright_shirt.tga and b/textures/gakfullbright_shirt.tga differ

diff --git a/textures/ignis_glow.tga b/textures/ignis_glow.tga
index c9eee49600fb3e8a403aa773ab9675f1ca2efe6e..7bcace5b80249d7e4f6fe4d740ed6c6db8ef64ff 100644 (file)
Binary files a/textures/ignis_glow.tga and b/textures/ignis_glow.tga differ

diff --git a/textures/ignisfullbright_glow.tga b/textures/ignisfullbright_glow.tga
index a010bdf3e9e855f320b8703d909b0b104155eb79..c97fb7f4d404e20d00fe9c274e654ef691fc1869 100644 (file)
Binary files a/textures/ignisfullbright_glow.tga and b/textures/ignisfullbright_glow.tga differ

diff --git a/textures/ignisfullbright_shirt.tga b/textures/ignisfullbright_shirt.tga
index 0a2f7fac551e42f2556242104537618e7191b8bd..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/ignisfullbright_shirt.tga and b/textures/ignisfullbright_shirt.tga differ

diff --git a/textures/ignishead_glow.tga b/textures/ignishead_glow.tga
index d23f7315bb107dc69a7c90f9ccbb045c08dea950..27aec27140a1fa4db45660b87cbff7695f79b072 100644 (file)
Binary files a/textures/ignishead_glow.tga and b/textures/ignishead_glow.tga differ

diff --git a/textures/nyxfullbright_glow.tga b/textures/nyxfullbright_glow.tga
index ec01e22847e408a3db8cefe5abc7d45eca128010..033e27402ab3b425d57807648dd7ad467d2edf49 100644 (file)
Binary files a/textures/nyxfullbright_glow.tga and b/textures/nyxfullbright_glow.tga differ

diff --git a/textures/pyria_glow.tga b/textures/pyria_glow.tga
index 53a46f3a807f13aa61450a36161a6b68b243ccb9..d1073950277c4a18a6a4fdfb68ed805be320ae3a 100644 (file)
Binary files a/textures/pyria_glow.tga and b/textures/pyria_glow.tga differ

diff --git a/textures/pyriafullbright_glow.tga b/textures/pyriafullbright_glow.tga
index ef6f686c6c15fc3250370ecee4e60a719a14906c..c3f1e781cc12d1518587693952ba80b523bdafba 100644 (file)
Binary files a/textures/pyriafullbright_glow.tga and b/textures/pyriafullbright_glow.tga differ

diff --git a/textures/pyriafullbright_shirt.tga b/textures/pyriafullbright_shirt.tga
index 62ca44604f4d9736719c222be9223426f44df80c..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/pyriafullbright_shirt.tga and b/textures/pyriafullbright_shirt.tga differ

diff --git a/textures/umbra_glow.tga b/textures/umbra_glow.tga
index ee222f67a02bb8c47d95945abce97afe51782947..dc6031ef11d64fdf0c2d08e200b07474ce8e17e0 100644 (file)
Binary files a/textures/umbra_glow.tga and b/textures/umbra_glow.tga differ

diff --git a/textures/umbrafullbright_glow.tga b/textures/umbrafullbright_glow.tga
index 4924c2a988ecf3e60d0f3d0d6df80f5c003e069d..adc75ee3fa786a475d9d1f643db87b8be5473a3c 100644 (file)
Binary files a/textures/umbrafullbright_glow.tga and b/textures/umbrafullbright_glow.tga differ

diff --git a/textures/umbrafullbright_shirt.tga b/textures/umbrafullbright_shirt.tga
index 8d04c364cc12551c79bb65cbf9d313e6150eeae1..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/umbrafullbright_shirt.tga and b/textures/umbrafullbright_shirt.tga differ