From: terencehill Date: Tue, 12 Apr 2022 11:56:49 +0000 (+0200) Subject: Merge branch 'master' into develop X-Git-Tag: xonotic-v0.8.5~7^2~9 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=af2f0cb624aaf967708b22e1303d113668af5114;hp=d17fba96da03896d8f439bb89aa7f17895150488 Merge branch 'master' into develop --- diff --git a/gamemodes-client.cfg b/gamemodes-client.cfg index c43b9d1d3f..71d272a174 100644 --- 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 81c4f3bae7..4597ceff1e 100644 --- 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 4597ceff1e..81c4f3bae7 100644 --- 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 81c4f3bae7..4597ceff1e 100644 --- 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 4597ceff1e..81c4f3bae7 100644 --- 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 81c4f3bae7..4597ceff1e 100644 --- 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 4597ceff1e..81c4f3bae7 100644 --- 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 f2da16714c..3844f6ceb7 100644 --- 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 3844f6ceb7..f2da16714c 100644 --- 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 f2da16714c..3844f6ceb7 100644 --- 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 3844f6ceb7..f2da16714c 100644 --- 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 f2da16714c..3844f6ceb7 100644 --- 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 3844f6ceb7..f2da16714c 100644 --- 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 2df68ec5aa..802db3e155 100644 --- 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 802db3e155..2df68ec5aa 100644 --- 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 2df68ec5aa..802db3e155 100644 --- 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 802db3e155..2df68ec5aa 100644 --- 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 2df68ec5aa..802db3e155 100644 --- 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 802db3e155..2df68ec5aa 100644 --- 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 a0e69e9fc7..2c93e982f5 100644 --- 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 2c93e982f5..a0e69e9fc7 100644 --- 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 a0e69e9fc7..2c93e982f5 100644 --- 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 2c93e982f5..a0e69e9fc7 100644 --- 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 a0e69e9fc7..2c93e982f5 100644 --- 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 2c93e982f5..a0e69e9fc7 100644 --- 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 d46d1576ac..eb257cc1d6 100644 --- 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 eb257cc1d6..d46d1576ac 100644 --- 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 d46d1576ac..eb257cc1d6 100644 --- 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 eb257cc1d6..d46d1576ac 100644 --- 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 d46d1576ac..eb257cc1d6 100644 --- 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 eb257cc1d6..d46d1576ac 100644 --- 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 383252cb85..19b5fd59b1 100644 --- 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 19b5fd59b1..383252cb85 100644 --- 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 383252cb85..19b5fd59b1 100644 --- 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 19b5fd59b1..383252cb85 100644 --- 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 383252cb85..19b5fd59b1 100644 --- 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 19b5fd59b1..383252cb85 100644 --- 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 7533a4c53a..1932354e80 100644 --- 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 1932354e80..7533a4c53a 100644 --- 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 7533a4c53a..1932354e80 100644 --- 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 1932354e80..7533a4c53a 100644 --- 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 7533a4c53a..1932354e80 100644 --- 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 1932354e80..7533a4c53a 100644 --- 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 a8ea4ee627..cf702a3c2a 100644 --- 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 cf702a3c2a..a8ea4ee627 100644 --- 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 a8ea4ee627..cf702a3c2a 100644 --- 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 cf702a3c2a..a8ea4ee627 100644 --- 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 a8ea4ee627..cf702a3c2a 100644 --- 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 cf702a3c2a..a8ea4ee627 100644 --- 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 7138ad587e..7b94ebe4a4 100644 --- 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 7b94ebe4a4..7138ad587e 100644 --- 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 7138ad587e..7b94ebe4a4 100644 --- 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 7b94ebe4a4..7138ad587e 100644 --- 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 7138ad587e..7b94ebe4a4 100644 --- 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 7b94ebe4a4..7138ad587e 100644 --- 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 447eeadfc4..cb9c3d0517 100644 --- 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 cb9c3d0517..447eeadfc4 100644 --- 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 447eeadfc4..cb9c3d0517 100644 --- 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 cb9c3d0517..447eeadfc4 100644 --- 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 447eeadfc4..cb9c3d0517 100644 --- 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 cb9c3d0517..447eeadfc4 100644 --- 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 7c9234fae3..f1f581a830 100644 --- 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 16cc29a0b0..165008ee94 100644 --- 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 0892bb6bf2..753ed24f86 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -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"); diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 855d20f818..7183d80c8b 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -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; } } diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 5132b49989..3cfd741a44 100644 --- 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 2157062b2a..aff0f764c7 100644 --- 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 6824680436..356c3882a9 100644 --- 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/textures/erebusfullbright_glow.tga b/textures/erebusfullbright_glow.tga index a91959d366..588569f6dd 100644 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 e506ce05fd..dd873f7d87 100644 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 ce4b6d6d3f..6bd287d143 100644 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 4f9d05336f..9aee3c18ac 100644 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 c9eee49600..7bcace5b80 100644 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 a010bdf3e9..c97fb7f4d4 100644 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 0a2f7fac55..9aee3c18ac 100644 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 d23f7315bb..27aec27140 100644 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 ec01e22847..033e27402a 100644 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 53a46f3a80..d107395027 100644 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 ef6f686c6c..c3f1e781cc 100644 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 62ca44604f..9aee3c18ac 100644 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 ee222f67a0..dc6031ef11 100644 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 4924c2a988..adc75ee3fa 100644 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 8d04c364cc..9aee3c18ac 100644 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 index 760337d53a..0000000000 --- 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 index f02d43cf10..0000000000 --- a/weapons.cfg.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -