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..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 100644 (file)
--- a/models/player/erebus.iqm_0.skin
+++ b/models/player/erebus.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebus
-erebus.001,shadowhead
+erebus,erebusfullbright
+erebus.001,shadowheadfb

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..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 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.001,shadowhead
+erebus,erebusfullbright
+erebus.001,shadowheadfb

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..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 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.001,shadowhead
+erebus,erebusfullbright
+erebus.001,shadowheadfb

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..f31cd8df5c8edad2ea9172723db013f435a383f0 100644 (file)
--- a/models/player/ignis.iqm_0.skin
+++ b/models/player/ignis.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
-ignis1.001,ignishead
+ignis1,ignisfullbright
+ignis1.001,ignisheadfb

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..f31cd8df5c8edad2ea9172723db013f435a383f0 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.001,ignishead
+ignis1,ignisfullbright
+ignis1.001,ignisheadfb

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..f31cd8df5c8edad2ea9172723db013f435a383f0 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.001,ignishead
+ignis1,ignisfullbright
+ignis1.001,ignisheadfb

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..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked.iqm_0.skin
+++ b/models/player/ignismasked.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
-ignis3,ignishead
+ignis1,ignisfullbright
+ignis3,ignisheadfb

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..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked_lod1.iqm_0.skin
+++ b/models/player/ignismasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
-ignis3,ignishead
+ignis1,ignisfullbright
+ignis3,ignisheadfb

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..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked_lod2.iqm_0.skin
+++ b/models/player/ignismasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis1,ignis
-ignis3,ignishead
+ignis1,ignisfullbright
+ignis3,ignisheadfb

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/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- a/models/player/megaerebus.iqm_0.skin
+++ b/models/player/megaerebus.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

diff --git a/models/player/megaerebus_lod1.iqm_0.skin b/models/player/megaerebus_lod1.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- a/models/player/megaerebus_lod1.iqm_0.skin
+++ b/models/player/megaerebus_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

diff --git a/models/player/megaerebus_lod2.iqm_0.skin b/models/player/megaerebus_lod2.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- a/models/player/megaerebus_lod2.iqm_0.skin
+++ b/models/player/megaerebus_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

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

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..2d1096323d0029a08276fee90318e648f626ea90 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.001,shadowhead
+nyx,nyxfullbright
+nyx.001,shadowheadfb

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..2d1096323d0029a08276fee90318e648f626ea90 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.001,shadowhead
+nyx,nyxfullbright
+nyx.001,shadowheadfb

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..1e69498f9f182535a562647f447e95bab549d14a 100644 (file)
--- a/models/player/seraphinamasked.iqm_0.skin
+++ b/models/player/seraphinamasked.iqm_0.skin
@@ -1,2 +1,2 @@
-ignis42,ignis
-ignis42.002,ignishead
+ignis42,ignisfullbright
+ignis42.002,ignisheadfb

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..1e69498f9f182535a562647f447e95bab549d14a 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.002,ignishead
+ignis42,ignisfullbright
+ignis42.002,ignisheadfb

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..1e69498f9f182535a562647f447e95bab549d14a 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.002,ignishead
+ignis42,ignisfullbright
+ignis42.002,ignisheadfb

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/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 7c9234fae33511d22a321fe1188f550c14c8cd3e..f1f581a83003077e3aa86a83cdb229c80799440f 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -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));
 }
 

diff --git a/qcsrc/client/csqcmodel_hooks.qh b/qcsrc/client/csqcmodel_hooks.qh
index 16cc29a0b06b10da56bb51174145dde8cd95df79..165008ee940e76de7fd51ba1956c6057e566129f 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qh
+++ b/qcsrc/client/csqcmodel_hooks.qh
@@ -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);

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 091cc466183efecd96bda5291383c2aab720acda..40d6cbbc2b6c2d4a93727927645993e04ed7b524 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -178,7 +178,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 a183c82d0ad04e2482cf522e73b94399d596cffd..530324656373d1346762879984b5473795df5af5 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1653,7 +1653,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;
                }
        }

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 5132b4998916f9e9a60f6bb86c6523560b0e2149..3cfd741a4495382c2ecf7b36b0adb34d7d6f0aef 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 2157062b2a7f5f3806c62055bded9a971fda7957..aff0f764c7759c2955a527f55960725dca8526e6 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 6824680436fe3c5f320649053c2e697aa84d8ff6..356c3882a920d84537261cbc8b9acb9ba7b26be2 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -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;
 }
 

diff --git a/scripts/player_erebus.shader b/scripts/player_erebus.shader
index 01c3e7450acb74f31d6ba0d6b7012ebf18bd9952..086d9c449fa1d4c5b1251ed2973ccde71ea8bdfc 100644 (file)
--- a/scripts/player_erebus.shader
+++ b/scripts/player_erebus.shader
@@ -16,6 +16,15 @@ erebusfullbright
        }
 }
 
+megaerebus
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/megaerebus.tga
+               rgbgen lightingDiffuse
+       }
+}
+
 shadowhead
 {
        dpreflectcube cubemaps/default/sky
@@ -24,3 +33,12 @@ shadowhead
                rgbgen lightingDiffuse
        }
 }
+
+shadowheadfb
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/shadowheadfb.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_ignis.shader b/scripts/player_ignis.shader
index 81fc6fc58afefcc0f2edc236cded4af6f98339fb..322463a2d663aee1b3b40754f7c8816d3ed9e7e5 100644 (file)
--- a/scripts/player_ignis.shader
+++ b/scripts/player_ignis.shader
@@ -6,6 +6,7 @@ ignis
                rgbgen lightingDiffuse
        }
 }
+
 ignisfullbright
 {
        dpreflectcube cubemaps/default/sky
@@ -23,3 +24,12 @@ ignishead
                rgbgen lightingDiffuse
        }
 }
+
+ignisheadfb
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/ignisheadfb.tga
+               rgbgen lightingDiffuse
+       }
+}

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

diff --git a/textures/erebusfullbright_shirt.tga b/textures/erebusfullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
Binary files a/textures/erebusfullbright_shirt.tga and b/textures/erebusfullbright_shirt.tga differ

diff --git a/textures/gakarmor_glow.tga b/textures/gakarmor_glow.tga
index 946e6b555736fecf36484571862f9444c79dbeae..c956996a8a6a5d3c3afb85bc4b119bf84a697576 100644 (file)
Binary files a/textures/gakarmor_glow.tga and b/textures/gakarmor_glow.tga differ

diff --git a/textures/gakarmor_shirt.tga b/textures/gakarmor_shirt.tga
deleted file mode 100644 (file)
index ce4b6d6..0000000
Binary files a/textures/gakarmor_shirt.tga and /dev/null differ

diff --git a/textures/gakarmorfb_glow.tga b/textures/gakarmorfb_glow.tga
index e506ce05fd994bbf6242ced5a9fb56485eff5a46..3e519002304f879ec6842eb8cd6d792370478c6d 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
deleted file mode 100644 (file)
index ce4b6d6..0000000
Binary files a/textures/gakarmorfb_shirt.tga and /dev/null differ

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

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

diff --git a/textures/ignis.tga b/textures/ignis.tga
index 768ac8896785298506a16740b2f4eaae7f06893c..bcd9f66eb907a98c80a9b516be5e3c5bbfee1234 100644 (file)
Binary files a/textures/ignis.tga and b/textures/ignis.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.tga b/textures/ignisfullbright.tga
index 768ac8896785298506a16740b2f4eaae7f06893c..bcd9f66eb907a98c80a9b516be5e3c5bbfee1234 100644 (file)
Binary files a/textures/ignisfullbright.tga and b/textures/ignisfullbright.tga differ

diff --git a/textures/ignisfullbright_glow.tga b/textures/ignisfullbright_glow.tga
index a010bdf3e9e855f320b8703d909b0b104155eb79..7bcace5b80249d7e4f6fe4d740ed6c6db8ef64ff 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..f7fbf008171a2bc8a2139622aa8269cf783b4f19 100644 (file)
Binary files a/textures/ignisfullbright_shirt.tga and b/textures/ignisfullbright_shirt.tga differ

diff --git a/textures/ignishead.tga b/textures/ignishead.tga
index 096b943f39d32f5c415f9d0e7759e9ec8e72469c..c95d1635a2b6206c8ba977b967f3ef4e5d0947d9 100644 (file)
Binary files a/textures/ignishead.tga and b/textures/ignishead.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/ignisheadfb.tga b/textures/ignisheadfb.tga
new file mode 100644 (file)
index 0000000..5cb7c56
Binary files /dev/null and b/textures/ignisheadfb.tga differ

diff --git a/textures/ignisheadfb_gloss.tga b/textures/ignisheadfb_gloss.tga
new file mode 100644 (file)
index 0000000..37bf376
Binary files /dev/null and b/textures/ignisheadfb_gloss.tga differ

diff --git a/textures/ignisheadfb_glow.tga b/textures/ignisheadfb_glow.tga
new file mode 100644 (file)
index 0000000..27aec27
Binary files /dev/null and b/textures/ignisheadfb_glow.tga differ

diff --git a/textures/ignisheadfb_norm.tga b/textures/ignisheadfb_norm.tga
new file mode 100644 (file)
index 0000000..ec4b095
Binary files /dev/null and b/textures/ignisheadfb_norm.tga differ

diff --git a/textures/ignisheadfb_reflect.tga b/textures/ignisheadfb_reflect.tga
new file mode 100644 (file)
index 0000000..2f3fa94
Binary files /dev/null and b/textures/ignisheadfb_reflect.tga differ

diff --git a/textures/ignisheadfb_shirt.tga b/textures/ignisheadfb_shirt.tga
new file mode 100644 (file)
index 0000000..de4034f
Binary files /dev/null and b/textures/ignisheadfb_shirt.tga differ

diff --git a/textures/megaerebus.tga b/textures/megaerebus.tga
new file mode 100644 (file)
index 0000000..2ef8341
Binary files /dev/null and b/textures/megaerebus.tga differ

diff --git a/textures/megaerebus_gloss.tga b/textures/megaerebus_gloss.tga
new file mode 100644 (file)
index 0000000..5004a75
Binary files /dev/null and b/textures/megaerebus_gloss.tga differ

diff --git a/textures/megaerebus_glow.tga b/textures/megaerebus_glow.tga
new file mode 100644 (file)
index 0000000..a91959d
Binary files /dev/null and b/textures/megaerebus_glow.tga differ

diff --git a/textures/megaerebus_norm.tga b/textures/megaerebus_norm.tga
new file mode 100644 (file)
index 0000000..007228b
Binary files /dev/null and b/textures/megaerebus_norm.tga differ

diff --git a/textures/megaerebus_reflect.tga b/textures/megaerebus_reflect.tga
new file mode 100644 (file)
index 0000000..a99f2d6
Binary files /dev/null and b/textures/megaerebus_reflect.tga differ

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

diff --git a/textures/nyxfullbright_shirt.tga b/textures/nyxfullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
Binary files a/textures/nyxfullbright_shirt.tga and b/textures/nyxfullbright_shirt.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/pyria_shirt.tga b/textures/pyria_shirt.tga
index 62ca44604f4d9736719c222be9223426f44df80c..e8e6a47acc29e2b7fdec84e4ddf79d417782fb4e 100644 (file)
Binary files a/textures/pyria_shirt.tga and b/textures/pyria_shirt.tga differ

diff --git a/textures/pyriafullbright_glow.tga b/textures/pyriafullbright_glow.tga
index ef6f686c6c15fc3250370ecee4e60a719a14906c..a4611f2859127d8a7a8e34d43a0bb7883bebc957 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..0e934d6464731b7c0804c414e167bcb9c66ae9a3 100644 (file)
Binary files a/textures/pyriafullbright_shirt.tga and b/textures/pyriafullbright_shirt.tga differ

diff --git a/textures/shadowhead_shirt.tga b/textures/shadowhead_shirt.tga
index aa1f645787227e6815ae01062a259a267a4f4d8f..648d9007641d56f3590404cb7d8daf46ce3e76c0 100644 (file)
Binary files a/textures/shadowhead_shirt.tga and b/textures/shadowhead_shirt.tga differ

diff --git a/textures/shadowheadfb.tga b/textures/shadowheadfb.tga
new file mode 100644 (file)
index 0000000..29893e2
Binary files /dev/null and b/textures/shadowheadfb.tga differ

diff --git a/textures/shadowheadfb_gloss.tga b/textures/shadowheadfb_gloss.tga
new file mode 100644 (file)
index 0000000..2abb3f0
Binary files /dev/null and b/textures/shadowheadfb_gloss.tga differ

diff --git a/textures/shadowheadfb_glow.tga b/textures/shadowheadfb_glow.tga
new file mode 100644 (file)
index 0000000..1e69d82
Binary files /dev/null and b/textures/shadowheadfb_glow.tga differ

diff --git a/textures/shadowheadfb_norm.tga b/textures/shadowheadfb_norm.tga
new file mode 100644 (file)
index 0000000..19dd82c
Binary files /dev/null and b/textures/shadowheadfb_norm.tga differ

diff --git a/textures/shadowheadfb_reflect.tga b/textures/shadowheadfb_reflect.tga
new file mode 100644 (file)
index 0000000..f22a578
Binary files /dev/null and b/textures/shadowheadfb_reflect.tga differ

diff --git a/textures/shadowheadfb_shirt.tga b/textures/shadowheadfb_shirt.tga
new file mode 100644 (file)
index 0000000..f49ef02
Binary files /dev/null and b/textures/shadowheadfb_shirt.tga differ

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

diff --git a/textures/umbra_shirt.tga b/textures/umbra_shirt.tga
index 8d04c364cc12551c79bb65cbf9d313e6150eeae1..2898c6917ed0b681d2d531337bbb9c457719d72d 100644 (file)
Binary files a/textures/umbra_shirt.tga and b/textures/umbra_shirt.tga differ

diff --git a/textures/umbrafullbright_glow.tga b/textures/umbrafullbright_glow.tga
index 4924c2a988ecf3e60d0f3d0d6df80f5c003e069d..1d32c01e51f2b01e3819feb75d019c0fe58b4004 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..7555385145b0c80e3d0769034d2efcc253d11baf 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
--- a/weapons.cfg
+++ /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
--- a/weapons.cfg.sh
+++ /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++;'

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 349a393c61a4150610685da12e6adfd66c926b57..f3c5ca7731151c512499a72d3e0d3ac7d3f01611 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -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