Merge branch 'master' into develop

diff --git a/gamemodes-client.cfg b/gamemodes-client.cfg
index c43b9d1d3f2e6fe73fddbb33e8489670350edc4d..71d272a174e7c50dcb868fa34e472d043668a250 100644 (file)
--- a/gamemodes-client.cfg
+++ b/gamemodes-client.cfg
@@ -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

diff --git a/models/player/erebus.iqm_0.skin b/models/player/erebus.iqm_0.skin
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
--- a/models/player/erebus.iqm_0.skin
+++ b/models/player/erebus.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead

diff --git a/models/player/erebus.iqm_1.skin b/models/player/erebus.iqm_1.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
--- a/models/player/erebus.iqm_1.skin
+++ b/models/player/erebus.iqm_1.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead

diff --git a/models/player/erebus_lod1.iqm_0.skin b/models/player/erebus_lod1.iqm_0.skin
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
--- a/models/player/erebus_lod1.iqm_0.skin
+++ b/models/player/erebus_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead

diff --git a/models/player/erebus_lod1.iqm_1.skin b/models/player/erebus_lod1.iqm_1.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
--- a/models/player/erebus_lod1.iqm_1.skin
+++ b/models/player/erebus_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead

diff --git a/models/player/erebus_lod2.iqm_0.skin b/models/player/erebus_lod2.iqm_0.skin
index 81c4f3bae7e96d8961eba00957c5e322fb2515ae..4597ceff1e90809a4e999ac1302734e1ef751b9c 100644 (file)
--- a/models/player/erebus_lod2.iqm_0.skin
+++ b/models/player/erebus_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead

diff --git a/models/player/erebus_lod2.iqm_1.skin b/models/player/erebus_lod2.iqm_1.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..81c4f3bae7e96d8961eba00957c5e322fb2515ae 100644 (file)
--- a/models/player/erebus_lod2.iqm_1.skin
+++ b/models/player/erebus_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
+erebus,erebus
 erebus.001,shadowhead

diff --git a/models/player/gak.iqm_0.skin b/models/player/gak.iqm_0.skin
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
--- a/models/player/gak.iqm_0.skin
+++ b/models/player/gak.iqm_0.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright

diff --git a/models/player/gak.iqm_1.skin b/models/player/gak.iqm_1.skin
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
--- a/models/player/gak.iqm_1.skin
+++ b/models/player/gak.iqm_1.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak

diff --git a/models/player/gak_lod1.iqm_0.skin b/models/player/gak_lod1.iqm_0.skin
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
--- a/models/player/gak_lod1.iqm_0.skin
+++ b/models/player/gak_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright

diff --git a/models/player/gak_lod1.iqm_1.skin b/models/player/gak_lod1.iqm_1.skin
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
--- a/models/player/gak_lod1.iqm_1.skin
+++ b/models/player/gak_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak

diff --git a/models/player/gak_lod2.iqm_0.skin b/models/player/gak_lod2.iqm_0.skin
index f2da16714c50ab517650bc3f54bd3f01d504ee92..3844f6ceb72c7a255ee43970f78dd74c6c05e15a 100644 (file)
--- a/models/player/gak_lod2.iqm_0.skin
+++ b/models/player/gak_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright

diff --git a/models/player/gak_lod2.iqm_1.skin b/models/player/gak_lod2.iqm_1.skin
index 3844f6ceb72c7a255ee43970f78dd74c6c05e15a..f2da16714c50ab517650bc3f54bd3f01d504ee92 100644 (file)
--- a/models/player/gak_lod2.iqm_1.skin
+++ b/models/player/gak_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak

diff --git a/models/player/gakmasked.iqm_0.skin b/models/player/gakmasked.iqm_0.skin
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
--- a/models/player/gakmasked.iqm_0.skin
+++ b/models/player/gakmasked.iqm_0.skin
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb

diff --git a/models/player/gakmasked.iqm_1.skin b/models/player/gakmasked.iqm_1.skin
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
--- a/models/player/gakmasked.iqm_1.skin
+++ b/models/player/gakmasked.iqm_1.skin
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor

diff --git a/models/player/gakmasked_lod1.iqm_0.skin b/models/player/gakmasked_lod1.iqm_0.skin
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
--- a/models/player/gakmasked_lod1.iqm_0.skin
+++ b/models/player/gakmasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb

diff --git a/models/player/gakmasked_lod1.iqm_1.skin b/models/player/gakmasked_lod1.iqm_1.skin
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
--- a/models/player/gakmasked_lod1.iqm_1.skin
+++ b/models/player/gakmasked_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor

diff --git a/models/player/gakmasked_lod2.iqm_0.skin b/models/player/gakmasked_lod2.iqm_0.skin
index 2df68ec5aad706cf7859cef9d332daa3cb54bed6..802db3e155a94101dbe15f65f242d5f15b42f37d 100644 (file)
--- a/models/player/gakmasked_lod2.iqm_0.skin
+++ b/models/player/gakmasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb

diff --git a/models/player/gakmasked_lod2.iqm_1.skin b/models/player/gakmasked_lod2.iqm_1.skin
index 802db3e155a94101dbe15f65f242d5f15b42f37d..2df68ec5aad706cf7859cef9d332daa3cb54bed6 100644 (file)
--- a/models/player/gakmasked_lod2.iqm_1.skin
+++ b/models/player/gakmasked_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor

diff --git a/models/player/ignis.iqm_0.skin b/models/player/ignis.iqm_0.skin
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
--- a/models/player/ignis.iqm_0.skin
+++ b/models/player/ignis.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead

diff --git a/models/player/ignis.iqm_1.skin b/models/player/ignis.iqm_1.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
--- a/models/player/ignis.iqm_1.skin
+++ b/models/player/ignis.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead

diff --git a/models/player/ignis_lod1.iqm_0.skin b/models/player/ignis_lod1.iqm_0.skin
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
--- a/models/player/ignis_lod1.iqm_0.skin
+++ b/models/player/ignis_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead

diff --git a/models/player/ignis_lod1.iqm_1.skin b/models/player/ignis_lod1.iqm_1.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
--- a/models/player/ignis_lod1.iqm_1.skin
+++ b/models/player/ignis_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead

diff --git a/models/player/ignis_lod2.iqm_0.skin b/models/player/ignis_lod2.iqm_0.skin
index a0e69e9fc730a9a7773bea4cc2bca52c680e5e31..2c93e982f5c75564477526e1c36af0b4190d3f25 100644 (file)
--- a/models/player/ignis_lod2.iqm_0.skin
+++ b/models/player/ignis_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis1.001,ignishead

diff --git a/models/player/ignis_lod2.iqm_1.skin b/models/player/ignis_lod2.iqm_1.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..a0e69e9fc730a9a7773bea4cc2bca52c680e5e31 100644 (file)
--- a/models/player/ignis_lod2.iqm_1.skin
+++ b/models/player/ignis_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis1.001,ignishead

diff --git a/models/player/ignismasked.iqm_0.skin b/models/player/ignismasked.iqm_0.skin
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
--- a/models/player/ignismasked.iqm_0.skin
+++ b/models/player/ignismasked.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead

diff --git a/models/player/ignismasked.iqm_1.skin b/models/player/ignismasked.iqm_1.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
--- a/models/player/ignismasked.iqm_1.skin
+++ b/models/player/ignismasked.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead

diff --git a/models/player/ignismasked_lod1.iqm_0.skin b/models/player/ignismasked_lod1.iqm_0.skin
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
--- a/models/player/ignismasked_lod1.iqm_0.skin
+++ b/models/player/ignismasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead

diff --git a/models/player/ignismasked_lod1.iqm_1.skin b/models/player/ignismasked_lod1.iqm_1.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
--- a/models/player/ignismasked_lod1.iqm_1.skin
+++ b/models/player/ignismasked_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead

diff --git a/models/player/ignismasked_lod2.iqm_0.skin b/models/player/ignismasked_lod2.iqm_0.skin
index d46d1576ac3b5303c04e57a43b0b6afeeac9d944..eb257cc1d619d04464532624c435455cf4ee04e9 100644 (file)
--- a/models/player/ignismasked_lod2.iqm_0.skin
+++ b/models/player/ignismasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
+ignis1,ignisfullbright
 ignis3,ignishead

diff --git a/models/player/ignismasked_lod2.iqm_1.skin b/models/player/ignismasked_lod2.iqm_1.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..d46d1576ac3b5303c04e57a43b0b6afeeac9d944 100644 (file)
--- a/models/player/ignismasked_lod2.iqm_1.skin
+++ b/models/player/ignismasked_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis1,ignisfullbright
+ignis1,ignis
 ignis3,ignishead

diff --git a/models/player/nyx.iqm_0.skin b/models/player/nyx.iqm_0.skin
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
--- a/models/player/nyx.iqm_0.skin
+++ b/models/player/nyx.iqm_0.skin
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead

diff --git a/models/player/nyx.iqm_1.skin b/models/player/nyx.iqm_1.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
--- a/models/player/nyx.iqm_1.skin
+++ b/models/player/nyx.iqm_1.skin
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead

diff --git a/models/player/nyx_lod1.iqm_0.skin b/models/player/nyx_lod1.iqm_0.skin
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
--- a/models/player/nyx_lod1.iqm_0.skin
+++ b/models/player/nyx_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead

diff --git a/models/player/nyx_lod1.iqm_1.skin b/models/player/nyx_lod1.iqm_1.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
--- a/models/player/nyx_lod1.iqm_1.skin
+++ b/models/player/nyx_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead

diff --git a/models/player/nyx_lod2.iqm_0.skin b/models/player/nyx_lod2.iqm_0.skin
index 383252cb85732d565c5b24abe2c445c1fcd22378..19b5fd59b1380c68a3369bdfdb18ad41d77588b4 100644 (file)
--- a/models/player/nyx_lod2.iqm_0.skin
+++ b/models/player/nyx_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-nyx,nyx
+nyx,nyxfullbright
 nyx.001,shadowhead

diff --git a/models/player/nyx_lod2.iqm_1.skin b/models/player/nyx_lod2.iqm_1.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..383252cb85732d565c5b24abe2c445c1fcd22378 100644 (file)
--- a/models/player/nyx_lod2.iqm_1.skin
+++ b/models/player/nyx_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-nyx,nyxfullbright
+nyx,nyx
 nyx.001,shadowhead

diff --git a/models/player/pyria.iqm_0.skin b/models/player/pyria.iqm_0.skin
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
--- a/models/player/pyria.iqm_0.skin
+++ b/models/player/pyria.iqm_0.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright

diff --git a/models/player/pyria.iqm_1.skin b/models/player/pyria.iqm_1.skin
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
--- a/models/player/pyria.iqm_1.skin
+++ b/models/player/pyria.iqm_1.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria

diff --git a/models/player/pyria_lod1.iqm_0.skin b/models/player/pyria_lod1.iqm_0.skin
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
--- a/models/player/pyria_lod1.iqm_0.skin
+++ b/models/player/pyria_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright

diff --git a/models/player/pyria_lod1.iqm_1.skin b/models/player/pyria_lod1.iqm_1.skin
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
--- a/models/player/pyria_lod1.iqm_1.skin
+++ b/models/player/pyria_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria

diff --git a/models/player/pyria_lod2.iqm_0.skin b/models/player/pyria_lod2.iqm_0.skin
index 7533a4c53adab086fe9866c766df919d631666f7..1932354e8078c3f24947504da7bbb93390c5a51a 100644 (file)
--- a/models/player/pyria_lod2.iqm_0.skin
+++ b/models/player/pyria_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright

diff --git a/models/player/pyria_lod2.iqm_1.skin b/models/player/pyria_lod2.iqm_1.skin
index 1932354e8078c3f24947504da7bbb93390c5a51a..7533a4c53adab086fe9866c766df919d631666f7 100644 (file)
--- a/models/player/pyria_lod2.iqm_1.skin
+++ b/models/player/pyria_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
 pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria

diff --git a/models/player/seraphina.iqm_0.skin b/models/player/seraphina.iqm_0.skin
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
--- a/models/player/seraphina.iqm_0.skin
+++ b/models/player/seraphina.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright

diff --git a/models/player/seraphina.iqm_1.skin b/models/player/seraphina.iqm_1.skin
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
--- a/models/player/seraphina.iqm_1.skin
+++ b/models/player/seraphina.iqm_1.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis

diff --git a/models/player/seraphina_lod1.iqm_0.skin b/models/player/seraphina_lod1.iqm_0.skin
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
--- a/models/player/seraphina_lod1.iqm_0.skin
+++ b/models/player/seraphina_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright

diff --git a/models/player/seraphina_lod1.iqm_1.skin b/models/player/seraphina_lod1.iqm_1.skin
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
--- a/models/player/seraphina_lod1.iqm_1.skin
+++ b/models/player/seraphina_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis

diff --git a/models/player/seraphina_lod2.iqm_0.skin b/models/player/seraphina_lod2.iqm_0.skin
index a8ea4ee62784799220586f63c1b4f3b8bc4be9ef..cf702a3c2a0d7f9aec42f3148bf71d9be608c66f 100644 (file)
--- a/models/player/seraphina_lod2.iqm_0.skin
+++ b/models/player/seraphina_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright

diff --git a/models/player/seraphina_lod2.iqm_1.skin b/models/player/seraphina_lod2.iqm_1.skin
index cf702a3c2a0d7f9aec42f3148bf71d9be608c66f..a8ea4ee62784799220586f63c1b4f3b8bc4be9ef 100644 (file)
--- a/models/player/seraphina_lod2.iqm_1.skin
+++ b/models/player/seraphina_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
 ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis

diff --git a/models/player/seraphinamasked.iqm_0.skin b/models/player/seraphinamasked.iqm_0.skin
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
--- a/models/player/seraphinamasked.iqm_0.skin
+++ b/models/player/seraphinamasked.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead

diff --git a/models/player/seraphinamasked.iqm_1.skin b/models/player/seraphinamasked.iqm_1.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
--- a/models/player/seraphinamasked.iqm_1.skin
+++ b/models/player/seraphinamasked.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead

diff --git a/models/player/seraphinamasked_lod1.iqm_0.skin b/models/player/seraphinamasked_lod1.iqm_0.skin
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
--- a/models/player/seraphinamasked_lod1.iqm_0.skin
+++ b/models/player/seraphinamasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead

diff --git a/models/player/seraphinamasked_lod1.iqm_1.skin b/models/player/seraphinamasked_lod1.iqm_1.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
--- a/models/player/seraphinamasked_lod1.iqm_1.skin
+++ b/models/player/seraphinamasked_lod1.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead

diff --git a/models/player/seraphinamasked_lod2.iqm_0.skin b/models/player/seraphinamasked_lod2.iqm_0.skin
index 7138ad587e31e81451b941144041fa5ffec81ec0..7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e 100644 (file)
--- a/models/player/seraphinamasked_lod2.iqm_0.skin
+++ b/models/player/seraphinamasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis42,ignis
+ignis42,ignisfullbright
 ignis42.002,ignishead

diff --git a/models/player/seraphinamasked_lod2.iqm_1.skin b/models/player/seraphinamasked_lod2.iqm_1.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..7138ad587e31e81451b941144041fa5ffec81ec0 100644 (file)
--- a/models/player/seraphinamasked_lod2.iqm_1.skin
+++ b/models/player/seraphinamasked_lod2.iqm_1.skin
@@ -1,2 +1,2 @@
-ignis42,ignisfullbright
+ignis42,ignis
 ignis42.002,ignishead

diff --git a/models/player/umbra.iqm_0.skin b/models/player/umbra.iqm_0.skin
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
--- a/models/player/umbra.iqm_0.skin
+++ b/models/player/umbra.iqm_0.skin
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright

diff --git a/models/player/umbra.iqm_1.skin b/models/player/umbra.iqm_1.skin
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
--- a/models/player/umbra.iqm_1.skin
+++ b/models/player/umbra.iqm_1.skin
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra

diff --git a/models/player/umbra_lod1.iqm_0.skin b/models/player/umbra_lod1.iqm_0.skin
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
--- a/models/player/umbra_lod1.iqm_0.skin
+++ b/models/player/umbra_lod1.iqm_0.skin
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright

diff --git a/models/player/umbra_lod1.iqm_1.skin b/models/player/umbra_lod1.iqm_1.skin
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
--- a/models/player/umbra_lod1.iqm_1.skin
+++ b/models/player/umbra_lod1.iqm_1.skin
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra

diff --git a/models/player/umbra_lod2.iqm_0.skin b/models/player/umbra_lod2.iqm_0.skin
index 447eeadfc469438ba7ce79de9414f258c51bac10..cb9c3d051749bd9c6ff3ec919fc1f2e487df1993 100644 (file)
--- a/models/player/umbra_lod2.iqm_0.skin
+++ b/models/player/umbra_lod2.iqm_0.skin
@@ -1 +1 @@
-umbra,umbra
+umbra,umbrafullbright

diff --git a/models/player/umbra_lod2.iqm_1.skin b/models/player/umbra_lod2.iqm_1.skin
index cb9c3d051749bd9c6ff3ec919fc1f2e487df1993..447eeadfc469438ba7ce79de9414f258c51bac10 100644 (file)
--- a/models/player/umbra_lod2.iqm_1.skin
+++ b/models/player/umbra_lod2.iqm_1.skin
@@ -1 +1 @@
-umbra,umbrafullbright
+umbra,umbra

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 6978247abba8c66570587e59ef00e566b87dc28a..5380fd5f5e3145a6571d038a15265af9c5048628 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -177,7 +177,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");

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 8b13146633c81e10c3b42712f0ecf3cb13eb22b3..66587e11144e70d64eeecb41680b2c18e718a1e6 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1710,7 +1710,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;
                }
        }