Merge branch 'master' into develop
authorterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
86 files changed:
gamemodes-client.cfg
models/player/erebus.iqm_0.skin
models/player/erebus.iqm_1.skin
models/player/erebus_lod1.iqm_0.skin
models/player/erebus_lod1.iqm_1.skin
models/player/erebus_lod2.iqm_0.skin
models/player/erebus_lod2.iqm_1.skin
models/player/gak.iqm_0.skin
models/player/gak.iqm_1.skin
models/player/gak_lod1.iqm_0.skin
models/player/gak_lod1.iqm_1.skin
models/player/gak_lod2.iqm_0.skin
models/player/gak_lod2.iqm_1.skin
models/player/gakmasked.iqm_0.skin
models/player/gakmasked.iqm_1.skin
models/player/gakmasked_lod1.iqm_0.skin
models/player/gakmasked_lod1.iqm_1.skin
models/player/gakmasked_lod2.iqm_0.skin
models/player/gakmasked_lod2.iqm_1.skin
models/player/ignis.iqm_0.skin
models/player/ignis.iqm_1.skin
models/player/ignis_lod1.iqm_0.skin
models/player/ignis_lod1.iqm_1.skin
models/player/ignis_lod2.iqm_0.skin
models/player/ignis_lod2.iqm_1.skin
models/player/ignismasked.iqm_0.skin
models/player/ignismasked.iqm_1.skin
models/player/ignismasked_lod1.iqm_0.skin
models/player/ignismasked_lod1.iqm_1.skin
models/player/ignismasked_lod2.iqm_0.skin
models/player/ignismasked_lod2.iqm_1.skin
models/player/nyx.iqm_0.skin
models/player/nyx.iqm_1.skin
models/player/nyx_lod1.iqm_0.skin
models/player/nyx_lod1.iqm_1.skin
models/player/nyx_lod2.iqm_0.skin
models/player/nyx_lod2.iqm_1.skin
models/player/pyria.iqm_0.skin
models/player/pyria.iqm_1.skin
models/player/pyria_lod1.iqm_0.skin
models/player/pyria_lod1.iqm_1.skin
models/player/pyria_lod2.iqm_0.skin
models/player/pyria_lod2.iqm_1.skin
models/player/seraphina.iqm_0.skin
models/player/seraphina.iqm_1.skin
models/player/seraphina_lod1.iqm_0.skin
models/player/seraphina_lod1.iqm_1.skin
models/player/seraphina_lod2.iqm_0.skin
models/player/seraphina_lod2.iqm_1.skin
models/player/seraphinamasked.iqm_0.skin
models/player/seraphinamasked.iqm_1.skin
models/player/seraphinamasked_lod1.iqm_0.skin
models/player/seraphinamasked_lod1.iqm_1.skin
models/player/seraphinamasked_lod2.iqm_0.skin
models/player/seraphinamasked_lod2.iqm_1.skin
models/player/umbra.iqm_0.skin
models/player/umbra.iqm_1.skin
models/player/umbra_lod1.iqm_0.skin
models/player/umbra_lod1.iqm_1.skin
models/player/umbra_lod2.iqm_0.skin
models/player/umbra_lod2.iqm_1.skin
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/csqcmodel_hooks.qh
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/weapons/all.qh
textures/erebusfullbright_glow.tga
textures/gakarmorfb_glow.tga
textures/gakarmorfb_shirt.tga
textures/gakfullbright_shirt.tga
textures/ignis_glow.tga
textures/ignisfullbright_glow.tga
textures/ignisfullbright_shirt.tga
textures/ignishead_glow.tga
textures/nyxfullbright_glow.tga
textures/pyria_glow.tga
textures/pyriafullbright_glow.tga
textures/pyriafullbright_shirt.tga
textures/umbra_glow.tga
textures/umbrafullbright_glow.tga
textures/umbrafullbright_shirt.tga
weapons.cfg [deleted file]
weapons.cfg.sh [deleted file]
xonotic-client.cfg

index c43b9d1d3f2e6fe73fddbb33e8489670350edc4d..71d272a174e7c50dcb868fa34e472d043668a250 100644 (file)
@@ -32,6 +32,6 @@ alias cl_hook_gamestart_ka
 alias cl_hook_gamestart_ft
 alias cl_hook_gamestart_inv
 alias cl_hook_gamestart_duel
-alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+alias cl_hook_gameend
 alias cl_hook_shutdown
 alias cl_hook_activeweapon
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra
index 7c9234fae33511d22a321fe1188f550c14c8cd3e..f1f581a83003077e3aa86a83cdb229c80799440f 100644 (file)
@@ -328,7 +328,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';
 
@@ -346,6 +346,10 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
                }
        }
 
+       // don't let the engine increase player's glowmod
+       if (autocvar_r_hdr_glowintensity > 1)
+               this.glowmod /= autocvar_r_hdr_glowintensity;
+
        //printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (this.csqcmodel_isdead ? "DEAD" : "ALIVE"), this.colormap, vtos(this.glowmod));
 }
 
index 16cc29a0b06b10da56bb51174145dde8cd95df79..165008ee940e76de7fd51ba1956c6057e566129f 100644 (file)
@@ -17,6 +17,7 @@ string autocvar__cl_playermodel;
 float autocvar_cl_deathglow;
 float autocvar_cl_deathglow_min = 0.5;
 float autocvar_cl_jetpack_attenuation = 2;
+float autocvar_r_hdr_glowintensity;
 
 // FEATURE: EF_NODRAW workalike
 const int EF_BRIGHTFIELD       = BIT(0);
index 0892bb6bf2bf0bd67a21ce4fa727a3c22ff988f5..753ed24f8614f747603510457db5633e7165eba1 100644 (file)
@@ -180,7 +180,14 @@ void Shutdown()
                if (!(calledhooks & HOOK_START))
                        localcmd("\n_cl_hook_gamestart nop\n");
                if (!(calledhooks & HOOK_END))
+               {
+                       int gamecount = cvar("cl_matchcount");
                        localcmd("\ncl_hook_gameend\n");
+                       // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+                       // earlier versions of the game abuse the hook to set this cvar
+                       localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+                       //cvar_set("cl_matchcount", itos(gamecount + 1));
+               }
        }
 
        localcmd("\ncl_hook_shutdown\n");
index 855d20f818fbf7d04028cd255ec5067f42ab25f8..7183d80c8be432be81153e230e98e58c0f110cdf 100644 (file)
@@ -1647,7 +1647,12 @@ void CSQC_UpdateView(entity this, float w, float h)
        {
                if(calledhooks & HOOK_START)
                {
+                       int gamecount = cvar("cl_matchcount");
                        localcmd("\ncl_hook_gameend\n");
+                       // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+                       // earlier versions of the game abuse the hook to set this cvar
+                       localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+                       //cvar_set("cl_matchcount", itos(gamecount + 1));
                        calledhooks |= HOOK_END;
                }
        }
index 5132b4998916f9e9a60f6bb86c6523560b0e2149..3cfd741a4495382c2ecf7b36b0adb34d7d6f0aef 100644 (file)
@@ -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
index 2157062b2a7f5f3806c62055bded9a971fda7957..aff0f764c7759c2955a527f55960725dca8526e6 100644 (file)
@@ -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)
index 6824680436fe3c5f320649053c2e697aa84d8ff6..356c3882a920d84537261cbc8b9acb9ba7b26be2 100644 (file)
@@ -308,14 +308,11 @@ WepSet WEPSET_SUPERWEAPONS;
 
 #include "all.inc"
 
-// TODO: remove after 0.8.2. Retains impulse number compatibility because 0.8.1 clients don't reload the weapons.cfg
-#define WEP_HARDCODED_IMPULSES 20
-
 // TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
 #define WEP_IMPULSE_BEGIN 230
 #define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (REGISTRY_COUNT(Weapons) - 1) - 1, 253)
 
-REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
+REGISTRY_SORT(Weapons, 1)
 REGISTRY_CHECK(Weapons)
 
 STATIC_INIT(register_weapons_done)
@@ -350,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;
 }
 
index a91959d3663f7d20ae2a3d6c6bdccc43ea360eff..588569f6dd418f009dfeffd34f8960d764aa52ec 100644 (file)
Binary files a/textures/erebusfullbright_glow.tga and b/textures/erebusfullbright_glow.tga differ
index e506ce05fd994bbf6242ced5a9fb56485eff5a46..dd873f7d87f0b2c8c3ec186f12ab650c47a13ba8 100644 (file)
Binary files a/textures/gakarmorfb_glow.tga and b/textures/gakarmorfb_glow.tga differ
index ce4b6d6d3fb4f847b8e4fd65e178b8df5ad4d6bf..6bd287d143cfc0f63ef3be5c3e6e3ced0bb2218a 100644 (file)
Binary files a/textures/gakarmorfb_shirt.tga and b/textures/gakarmorfb_shirt.tga differ
index 4f9d05336f56564c68ea9dbdd9fc81851589a681..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/gakfullbright_shirt.tga and b/textures/gakfullbright_shirt.tga differ
index c9eee49600fb3e8a403aa773ab9675f1ca2efe6e..7bcace5b80249d7e4f6fe4d740ed6c6db8ef64ff 100644 (file)
Binary files a/textures/ignis_glow.tga and b/textures/ignis_glow.tga differ
index a010bdf3e9e855f320b8703d909b0b104155eb79..c97fb7f4d404e20d00fe9c274e654ef691fc1869 100644 (file)
Binary files a/textures/ignisfullbright_glow.tga and b/textures/ignisfullbright_glow.tga differ
index 0a2f7fac551e42f2556242104537618e7191b8bd..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/ignisfullbright_shirt.tga and b/textures/ignisfullbright_shirt.tga differ
index d23f7315bb107dc69a7c90f9ccbb045c08dea950..27aec27140a1fa4db45660b87cbff7695f79b072 100644 (file)
Binary files a/textures/ignishead_glow.tga and b/textures/ignishead_glow.tga differ
index ec01e22847e408a3db8cefe5abc7d45eca128010..033e27402ab3b425d57807648dd7ad467d2edf49 100644 (file)
Binary files a/textures/nyxfullbright_glow.tga and b/textures/nyxfullbright_glow.tga differ
index 53a46f3a807f13aa61450a36161a6b68b243ccb9..d1073950277c4a18a6a4fdfb68ed805be320ae3a 100644 (file)
Binary files a/textures/pyria_glow.tga and b/textures/pyria_glow.tga differ
index ef6f686c6c15fc3250370ecee4e60a719a14906c..c3f1e781cc12d1518587693952ba80b523bdafba 100644 (file)
Binary files a/textures/pyriafullbright_glow.tga and b/textures/pyriafullbright_glow.tga differ
index 62ca44604f4d9736719c222be9223426f44df80c..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/pyriafullbright_shirt.tga and b/textures/pyriafullbright_shirt.tga differ
index ee222f67a02bb8c47d95945abce97afe51782947..dc6031ef11d64fdf0c2d08e200b07474ce8e17e0 100644 (file)
Binary files a/textures/umbra_glow.tga and b/textures/umbra_glow.tga differ
index 4924c2a988ecf3e60d0f3d0d6df80f5c003e069d..adc75ee3fa786a475d9d1f643db87b8be5473a3c 100644 (file)
Binary files a/textures/umbrafullbright_glow.tga and b/textures/umbrafullbright_glow.tga differ
index 8d04c364cc12551c79bb65cbf9d313e6150eeae1..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/umbrafullbright_shirt.tga and b/textures/umbrafullbright_shirt.tga differ
diff --git a/weapons.cfg b/weapons.cfg
deleted file mode 100644 (file)
index 760337d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-alias weapon_blaster "impulse 230"
-alias weapon_shotgun "impulse 231"
-alias weapon_machinegun "impulse 232"
-alias weapon_mortar "impulse 233"
-alias weapon_minelayer "impulse 234"
-alias weapon_electro "impulse 235"
-alias weapon_crylink "impulse 236"
-alias weapon_vortex "impulse 237"
-alias weapon_hagar "impulse 238"
-alias weapon_devastator "impulse 239"
-alias weapon_porto "impulse 240"
-alias weapon_vaporizer "impulse 241"
-alias weapon_hook "impulse 242"
-alias weapon_hlac "impulse 243"
-alias weapon_tuba "impulse 244"
-alias weapon_rifle "impulse 245"
-alias weapon_fireball "impulse 246"
-alias weapon_seeker "impulse 247"
-alias weapon_shockwave "impulse 248"
-alias weapon_arc "impulse 249"
diff --git a/weapons.cfg.sh b/weapons.cfg.sh
deleted file mode 100755 (executable)
index f02d43c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-<qcsrc/server/w_all.qc perl -ne 'BEGIN{$i=230}/w_(.*?)\./ or+next;printf qq{alias weapon_%s "impulse %d"\n},$1,$i++;'
index 349a393c61a4150610685da12e6adfd66c926b57..f3c5ca7731151c512499a72d3e0d3ac7d3f01611 100644 (file)
@@ -386,8 +386,6 @@ alias weapon_group_7 "impulse 7"
 alias weapon_group_8 "impulse 8"
 alias weapon_group_9 "impulse 9"
 alias weapon_group_0 "impulse 14" // cycles the superweapons
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-exec weapons.cfg
 
 cl_curl_enabled 1
 cl_curl_maxdownloads 3