Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
298 files changed:
Makefile
balanceXPM.cfg
bots.txt
defaultXonotic.cfg
effectinfo.txt
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
gfx/brand.tga [deleted file]
models/items/a_bullets.md3
models/items/a_bullets.mdl
models/items/a_rockets.md3
models/player/lurk.zym [deleted file]
models/player/lurk.zym_0.skin [deleted file]
models/player/lurk.zym_0.sounds [deleted file]
models/player/lurk.zym_0.tga [deleted file]
models/player/lurk.zym_0.txt [deleted file]
models/player/lurk.zym_1.skin [deleted file]
models/player/lurk.zym_1.sounds [deleted file]
models/player/lurk.zym_1.tga [deleted file]
models/player/lurk.zym_1.txt [deleted file]
models/player/lurk_lod1.zym [deleted file]
models/player/lurk_lod1.zym_0.skin [deleted file]
models/player/lurk_lod1.zym_1.skin [deleted file]
models/player/lurk_lod2.zym [deleted file]
models/player/lurk_lod2.zym_0.skin [deleted file]
models/player/lurk_lod2.zym_1.skin [deleted file]
models/player/marine.zym [deleted file]
models/player/marine.zym_0.skin [deleted file]
models/player/marine.zym_0.sounds [deleted file]
models/player/marine.zym_0.tga [deleted file]
models/player/marine.zym_0.txt [deleted file]
models/player/marine_lod1.zym [deleted file]
models/player/marine_lod1.zym_0.skin [deleted file]
models/player/marine_lod2.zym [deleted file]
models/player/marine_lod2.zym_0.skin [deleted file]
models/player/nexus.zym [deleted file]
models/player/nexus.zym_0.skin [deleted file]
models/player/nexus.zym_0.sounds [deleted file]
models/player/nexus.zym_0.tga [deleted file]
models/player/nexus.zym_0.txt [deleted file]
models/player/nexus.zym_1.skin [deleted file]
models/player/nexus.zym_1.sounds [deleted file]
models/player/nexus.zym_1.tga [deleted file]
models/player/nexus.zym_1.txt [deleted file]
models/player/nexus.zym_2.skin [deleted file]
models/player/nexus.zym_3.skin [deleted file]
models/player/nexus.zym_4.skin [deleted file]
models/player/nexus.zym_5.skin [deleted file]
models/player/nexus.zym_6.skin [deleted file]
models/player/nexus2.sounds [deleted file]
models/player/nexus_lod1.zym [deleted file]
models/player/nexus_lod1.zym_0.skin [deleted file]
models/player/nexus_lod1.zym_1.skin [deleted file]
models/player/nexus_lod1.zym_2.skin [deleted file]
models/player/nexus_lod1.zym_3.skin [deleted file]
models/player/nexus_lod1.zym_4.skin [deleted file]
models/player/nexus_lod1.zym_5.skin [deleted file]
models/player/nexus_lod1.zym_6.skin [deleted file]
models/player/nexus_lod2.zym [deleted file]
models/player/nexus_lod2.zym_0.skin [deleted file]
models/player/nexus_lod2.zym_1.skin [deleted file]
models/player/nexus_lod2.zym_2.skin [deleted file]
models/player/nexus_lod2.zym_3.skin [deleted file]
models/player/nexus_lod2.zym_4.skin [deleted file]
models/player/nexus_lod2.zym_5.skin [deleted file]
models/player/nexus_lod2.zym_6.skin [deleted file]
models/player/pyria.iqm [new file with mode: 0644]
models/player/pyria.iqm.framegroups [new file with mode: 0644]
models/player/pyria.iqm_0.sounds [new file with mode: 0644]
models/player/pyria.iqm_0.tga [new file with mode: 0644]
models/player/pyria.iqm_0.txt [new file with mode: 0644]
models/player/pyrianew.iqm [deleted file]
models/player/pyrianew.iqm.framegroups [deleted file]
models/player/umbra.blend [deleted file]
models/player/umbra.iqm_0.txt
models/player/xolar.dpm [deleted file]
models/player/xolar.dpm.framegroups [deleted file]
models/player/xolar.dpm_0.sounds [deleted file]
models/player/xolar.dpm_0.tga [deleted file]
models/player/xolar.dpm_0.txt [deleted file]
models/player/xolar_lod1.dpm [deleted file]
models/player/xolar_lod1.dpm.framegroups [deleted file]
models/player/xolar_lod2.dpm [deleted file]
models/player/xolar_lod2.dpm.animinfo [deleted file]
models/player/xolar_lod2.dpm.framegroups [deleted file]
models/weapons/h_campingrifle.dpm [deleted file]
models/weapons/h_campingrifle.dpm.framegroups [deleted file]
models/weapons/h_campingrifle.iqm [new file with mode: 0644]
models/weapons/h_campingrifle.iqm.framegroups [new file with mode: 0644]
models/weapons/h_crylink.dpm [deleted file]
models/weapons/h_crylink.dpm.framegroups [deleted file]
models/weapons/h_crylink.iqm [new file with mode: 0644]
models/weapons/h_crylink.iqm.framegroups [new file with mode: 0644]
models/weapons/h_electro.dpm [deleted file]
models/weapons/h_electro.dpm.framegroups [deleted file]
models/weapons/h_electro.iqm [new file with mode: 0644]
models/weapons/h_electro.iqm.framegroups [new file with mode: 0644]
models/weapons/h_fireball.dpm [deleted file]
models/weapons/h_fireball.dpm.framegroups [deleted file]
models/weapons/h_fireball.iqm [new file with mode: 0644]
models/weapons/h_fireball.iqm.framegroups [new file with mode: 0644]
models/weapons/h_gl.dpm [deleted file]
models/weapons/h_gl.dpm.framegroups [deleted file]
models/weapons/h_gl.iqm [new file with mode: 0644]
models/weapons/h_gl.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hagar.dpm [deleted file]
models/weapons/h_hagar.dpm.framegroups [deleted file]
models/weapons/h_hagar.iqm [new file with mode: 0644]
models/weapons/h_hagar.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hagar.iqm.md3 [new file with mode: 0644]
models/weapons/h_hlac.dpm [deleted file]
models/weapons/h_hlac.dpm.framegroups [deleted file]
models/weapons/h_hlac.iqm [new file with mode: 0644]
models/weapons/h_hlac.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hookgun.dpm [deleted file]
models/weapons/h_hookgun.dpm.framegroups [deleted file]
models/weapons/h_hookgun.iqm [new file with mode: 0644]
models/weapons/h_hookgun.iqm.framegroups [new file with mode: 0644]
models/weapons/h_laser.dpm [deleted file]
models/weapons/h_laser.dpm.framegroups [deleted file]
models/weapons/h_laser.iqm [new file with mode: 0644]
models/weapons/h_laser.iqm.framegroups [new file with mode: 0644]
models/weapons/h_minstanex.dpm [deleted file]
models/weapons/h_minstanex.dpm.framegroups [deleted file]
models/weapons/h_minstanex.iqm [new file with mode: 0644]
models/weapons/h_minstanex.iqm.framegroups [new file with mode: 0644]
models/weapons/h_nex.dpm [deleted file]
models/weapons/h_nex.dpm.framegroups [deleted file]
models/weapons/h_nex.iqm [new file with mode: 0644]
models/weapons/h_nex.iqm.framegroups [new file with mode: 0644]
models/weapons/h_porto.dpm [deleted file]
models/weapons/h_porto.dpm.framegroups [deleted file]
models/weapons/h_porto.iqm [new file with mode: 0644]
models/weapons/h_porto.iqm.framegroups [new file with mode: 0644]
models/weapons/h_rl.dpm [deleted file]
models/weapons/h_rl.dpm.framegroups [deleted file]
models/weapons/h_rl.iqm [new file with mode: 0644]
models/weapons/h_rl.iqm.framegroups [new file with mode: 0644]
models/weapons/h_seeker.dpm [deleted file]
models/weapons/h_seeker.dpm.framegroups [deleted file]
models/weapons/h_seeker.iqm [new file with mode: 0644]
models/weapons/h_seeker.iqm.framegroups [new file with mode: 0644]
models/weapons/h_shotgun.dpm [deleted file]
models/weapons/h_shotgun.dpm.framegroups [deleted file]
models/weapons/h_shotgun.iqm [new file with mode: 0644]
models/weapons/h_shotgun.iqm.framegroups [new file with mode: 0644]
models/weapons/h_tuba.dpm [deleted file]
models/weapons/h_tuba.dpm.framegroups [deleted file]
models/weapons/h_tuba.iqm [new file with mode: 0644]
models/weapons/h_tuba.iqm.framegroups [new file with mode: 0644]
models/weapons/h_uzi.dpm [deleted file]
models/weapons/h_uzi.dpm.framegroups [deleted file]
models/weapons/h_uzi.iqm [new file with mode: 0644]
models/weapons/h_uzi.iqm.framegroups [new file with mode: 0644]
models/weapons/v_campingrifle.md3
models/weapons/v_crylink.md3
models/weapons/v_electro.md3
models/weapons/v_fireball.md3
models/weapons/v_gl.md3
models/weapons/v_hagar.md3
models/weapons/v_hlac.md3
models/weapons/v_hookgun.md3
models/weapons/v_laser.md3
models/weapons/v_minstanex.md3
models/weapons/v_nex.md3
models/weapons/v_porto.md3
models/weapons/v_rl.md3
models/weapons/v_seeker.md3
models/weapons/v_shotgun.md3
models/weapons/v_tuba.md3
models/weapons/v_uzi.md3
physicsNoQWBunny.cfg
qcsrc/client/Main.qc
qcsrc/menu/anim/animation.c
qcsrc/menu/anim/easing.c
qcsrc/menu/anim/keyframe.c
qcsrc/menu/item/listbox.c
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/bot/bot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/w_campingrifle.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc
scripts/model-common.shader [new file with mode: 0644]
scripts/pyria.shader [new file with mode: 0644]
scripts/pyrianew.shader [deleted file]
scripts/turrets.shader [new file with mode: 0644]
textures/fbcolored.tga [deleted file]
textures/fbcolored_bump.tga [deleted file]
textures/fbcolored_gloss.tga [deleted file]
textures/fbcolored_shirt.tga [deleted file]
textures/fbgreen.tga [deleted file]
textures/fbgreen_bump.tga [deleted file]
textures/fbgreen_gloss.tga [deleted file]
textures/fbgreen_glow.tga [deleted file]
textures/fbgreen_pants.tga [deleted file]
textures/fbgreen_shirt.tga [deleted file]
textures/fborange.tga [deleted file]
textures/fborange_bump.tga [deleted file]
textures/fborange_gloss.tga [deleted file]
textures/fborange_glow.tga [deleted file]
textures/fborange_pants.tga [deleted file]
textures/fborange_shirt.tga [deleted file]
textures/fbred.tga [deleted file]
textures/fbred_bump.tga [deleted file]
textures/fbred_gloss.tga [deleted file]
textures/fbred_glow.tga [deleted file]
textures/fbred_pants.tga [deleted file]
textures/fbred_shirt.tga [deleted file]
textures/items/a_bullets.jpg [new file with mode: 0644]
textures/items/a_rocket_box.jpg [new file with mode: 0644]
textures/items/a_rocket_gre.jpg [new file with mode: 0644]
textures/items/a_rocket_gre_glow.jpg [new file with mode: 0644]
textures/items/a_rocket_roc.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_gloss.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_glow.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_norm.jpg [new file with mode: 0644]
textures/items/a_rocket_tag.jpg [new file with mode: 0644]
textures/lurk.tga [deleted file]
textures/lurk_bump.tga [deleted file]
textures/lurk_gloss.tga [deleted file]
textures/lurk_glow.tga [deleted file]
textures/lurk_pants.tga [deleted file]
textures/lurk_shirt.tga [deleted file]
textures/marine.tga [deleted file]
textures/marine_gloss.tga [deleted file]
textures/marine_glow.tga [deleted file]
textures/marine_norm.tga [deleted file]
textures/marine_pants.tga [deleted file]
textures/marine_shirt.tga [deleted file]
textures/mulder.tga [deleted file]
textures/mulder_bump.tga [deleted file]
textures/mulder_gloss.tga [deleted file]
textures/mulder_glow.tga [deleted file]
textures/mulder_pants.tga [deleted file]
textures/mulder_shirt.tga [deleted file]
textures/nexus.tga [deleted file]
textures/nexus_gloss.tga [deleted file]
textures/nexus_glow.tga [deleted file]
textures/nexus_pants.tga [deleted file]
textures/nexus_shirt.tga [deleted file]
textures/pyria.tga [new file with mode: 0644]
textures/pyria_gloss.jpg [new file with mode: 0644]
textures/pyria_glow.jpg [new file with mode: 0644]
textures/pyria_glow.tga [new file with mode: 0644]
textures/pyria_norm.tga [new file with mode: 0644]
textures/pyria_pants.tga [new file with mode: 0644]
textures/pyria_shirt.tga [new file with mode: 0644]
textures/pyriahair.jpg [new file with mode: 0644]
textures/pyriahair_alpha.jpg [new file with mode: 0644]
textures/pyriahair_gloss.jpg [new file with mode: 0644]
textures/pyriahair_norm.jpg [new file with mode: 0644]
textures/pyrianew.tga [deleted file]
textures/pyrianew_gloss.jpg [deleted file]
textures/pyrianew_glow.jpg [deleted file]
textures/pyrianew_glow.tga [deleted file]
textures/pyrianew_norm.tga [deleted file]
textures/pyrianew_pants.tga [deleted file]
textures/pyrianew_shirt.tga [deleted file]
textures/pyrianewhair.jpg [deleted file]
textures/pyrianewhair_alpha.jpg [deleted file]
textures/pyrianewhair_gloss.jpg [deleted file]
textures/pyrianewhair_norm.jpg [deleted file]
textures/rl.tga [new file with mode: 0644]
textures/rl_gloss.jpg [new file with mode: 0644]
textures/rl_norm.tga [new file with mode: 0644]
textures/rl_pants.tga [new file with mode: 0644]
textures/rl_shirt.tga [new file with mode: 0644]
textures/xolar.tga [deleted file]
textures/xolar_bump.tga [deleted file]
textures/xolar_gloss.tga [deleted file]
textures/xolar_glow.tga [deleted file]
textures/xolar_norm.tga [deleted file]
textures/xolar_pants.tga [deleted file]
textures/xolar_shirt.tga [deleted file]
xonotic-credits.txt

index 7128da2d683edadfd6d829cdc585b831a0b31689..313fb840289013183ec5a9524394a1f5ca773cdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
+FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"'
+FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK)
 FTEQCCFLAGS_PROGS ?= 
 FTEQCCFLAGS_MENU ?= 
 
@@ -57,12 +58,15 @@ clean:
        rm -f progs.dat menu.dat csprogs.dat
 
 csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* qcsrc/warpzonelib/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/client\'
        cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS)
 
 progs.dat: qcsrc/server/*.* qcsrc/common/*.* qcsrc/server/*/*.* qcsrc/server/*/*/*.* qcsrc/warpzonelib/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/server\'
        cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS)
 
 menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/menu\'
        cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
index 4d2fd05f6905a9f69c1606c8cb2c9fcef166b9c7..f3b12059be0bc3a4ccd9333ee7aea8bf3d924ef7 100644 (file)
@@ -248,8 +248,8 @@ set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
-set g_balance_shotgun_primary_bullets 36
-set g_balance_shotgun_primary_damage 3
+set g_balance_shotgun_primary_bullets 25
+set g_balance_shotgun_primary_damage 4
 set g_balance_shotgun_primary_force 10
 set g_balance_shotgun_primary_spread 0.18
 set g_balance_shotgun_primary_refire 1
@@ -275,8 +275,8 @@ set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.007
 set g_balance_uzi_first_refire 0.15
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 30
+set g_balance_uzi_sustained_damage 5
+set g_balance_uzi_sustained_force 10
 set g_balance_uzi_sustained_spread 0.02
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
@@ -392,10 +392,10 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 100
+set g_balance_nex_damage 80
 set g_balance_nex_force 200
 set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 0.8
+set g_balance_nex_animtime 1.25
 set g_balance_nex_ammo 5
 set g_balance_nex_damagefalloff_mindist 1000
 set g_balance_nex_damagefalloff_maxdist 3000
index 4c2c12d2eb92225aea05fe618ba04e4298e455e2..0530c99f92170ce83b8ea22b7cb59c85f11d088f 100644 (file)
--- a/bots.txt
+++ b/bots.txt
@@ -1,21 +1,21 @@
 //bot configuration: name      model   skin    shirt   pants   team    keyboard use    moving  dodging ping    weapon use      aggressivity    range   aiming  calmhand        mouse   fightthink      aithink
 //default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink                                                                                                                                 
 //use -1 for shirt-color or pants-color to get random colors                                                                                                                                   
-Hellfire       nexus   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
-Toxic  nexus   1       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
-Discovery      nexus   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
-Pegasus        nexus   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
-Eureka nexus   0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
-Airhead        nexus   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
-Gator  nexus   0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
-Delirium       nexus   1       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
-Death  nexus   0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
-Scorcher       nexus   0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
-Necrotic       nexus   0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
-Dominator      nexus   1       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
-Thunderstorm   nexus   2       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
-Mystery        nexus   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
-Lion   nexus   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
-Sensible       nexus   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
-Shadow nexus   0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
-Resurrection   nexus   0       1       1       0       0       -0.5    -0.5    0       2       -1      -1      -1      0       -1      1       1
+Hellfire       umbra   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
+Toxic  umbra   0       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
+Discovery      umbra   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
+Pegasus        umbra   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
+Eureka umbra   0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
+Airhead        umbra   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
+Gator  umbra   0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
+Delirium       umbra   0       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
+Death  umbra   0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
+Scorcher       umbra   0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
+Necrotic       umbra   0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
+Dominator      umbra   0       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
+Thunderstorm   umbra   0       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
+Mystery        umbra   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
+Lion   umbra   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
+Sensible       umbra   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
+Shadow umbra   0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
+Resurrection   umbra   0       1       1       0       0       -0.5    -0.5    0       2       -1      -1      -1      0       -1      1       1
index b6c93ae0649fdf9934a95c23a991fbfb874ba343..4752f9100ea550ff61684be578d89da4e521e0eb 100644 (file)
@@ -1,17 +1,5 @@
 set g_xonoticversion 2.5svn    "Xonotic version (formatted for humans)"
 
-//!<showbrand
-showbrand 3
-echo
-echo A warning about this being a SVN development version was set up.
-echo This build shall be used for development and testing only!
-echo
-echo If you want to disable this warning, add the line
-echo   showbrand 0
-echo to your autoexec.cfg.
-echo
-//!>showbrand
-
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
@@ -105,7 +93,7 @@ mod_q3bsp_lightmapmergepower 3
 // player defaults
 _cl_color 102
 _cl_name Player
-_cl_playermodel models/player/marine.zym
+_cl_playermodel models/player/umbra.iqm
 _cl_playerskin 0
 crosshair 1
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"
index f915b0e53a250c298d2cf133c426541f134a0110..53926a7a0b203cb37859fb8cc5a92443d0d15ee1 100644 (file)
@@ -14,7 +14,7 @@ lightradiusfade 200
 lightcolor 0.4 0.9 0.9
 // cloud of particles which expand rapidly and then slow to form a ball
 effect TE_WIZSPIKE
-count 100
+count 50
 type static
 color 0x63F2EA 0x63f2EA
 size 2 2
@@ -47,7 +47,7 @@ alpha 256 256 1024
 size 24 24
 // sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
 effect TE_KNIGHTSPIKE
-count 256
+count 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 1024
@@ -70,7 +70,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_SPIKE
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -81,7 +81,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SPIKE
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -92,7 +92,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // bouncing sparks
 effect TE_SPIKE
-count 20
+count 10
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -125,7 +125,7 @@ size 48 48
 alpha 256 256 128
 // large sparks
 effect TE_SPIKEQUAD
-count 20
+count 10
 type static
 color 0x2030FF 0x80C0FF
 size 32 32
@@ -149,7 +149,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_SUPERSPIKE
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -160,7 +160,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SUPERSPIKE
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -171,7 +171,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // sparks that disappear on impact
 effect TE_SUPERSPIKE
-count 30
+count 15
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -196,7 +196,7 @@ lightradiusfade 500
 lightcolor 0.15 0.15 1.5
 // dust/smoke drifting away from the impact
 effect TE_SUPERSPIKEQUAD
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -207,7 +207,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SUPERSPIKEQUAD
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -218,7 +218,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // sparks that disappear on impact
 effect TE_SUPERSPIKEQUAD
-count 30
+count 15
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -240,7 +240,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_GUNSHOT
-count 4
+count 2
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -251,7 +251,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_GUNSHOT
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -262,7 +262,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // bouncing sparks
 effect TE_GUNSHOT
-count 10
+count 5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -295,7 +295,7 @@ size 8 8
 alpha 256 256 512
 // purple sparks
 effect TE_GUNSHOTQUAD
-count 12
+count 6
 type spark
 color 0xA040C0 0xFFFFFF
 size 1 1
@@ -329,7 +329,7 @@ alpha 192 192 64
 // fire effect which expands then slows
 effect TE_EXPLOSION
 notunderwater
-count 128
+count 64
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -343,7 +343,7 @@ velocityjitter 256 256 256
 // underwater bubbles
 effect TE_EXPLOSION
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -357,7 +357,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect TE_EXPLOSION
 notunderwater
-count 32
+count 16
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -385,7 +385,7 @@ lightcolor 4 2 8
 // smoke cloud
 effect TE_EXPLOSIONQUAD
 notunderwater
-count 32
+count 16
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -395,7 +395,7 @@ velocityjitter 48 48 48
 // underwater bubbles
 effect TE_EXPLOSIONQUAD
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -409,7 +409,7 @@ velocityjitter 96 96 96
 // sparks which go through walls
 effect TE_EXPLOSIONQUAD
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 1 1
@@ -436,7 +436,7 @@ lightcolor 1.6 0.8 2
 // smoke cloud
 effect TE_TAREXPLOSION
 notunderwater
-count 32
+count 16
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -446,7 +446,7 @@ velocityjitter 48 48 48
 // underwater bubbles
 effect TE_TAREXPLOSION
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -460,7 +460,7 @@ velocityjitter 96 96 96
 // sparks which go through walls
 effect TE_TAREXPLOSION
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 1 1
@@ -474,7 +474,7 @@ velocityjitter 256 256 256
 // bloody impact effect indicating damage
 // used nowhere in code
 effect TE_BLOOD
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 8 8
@@ -493,7 +493,7 @@ staintex 16 24
 // used in qcsrc/server/antilag.qc:            te_spark(antilag_takebackorigin(e, time - e.antilag_debug), '0 0 0', 32)
 // used in qcsrc/server/g_triggers.qc: self.mdl = "TE_SPARK"
 effect TE_SPARK
-count 1
+count 0.5
 type spark
 tex 40 40
 color 0x8f4333 0xfff31b
@@ -528,7 +528,7 @@ size 8 8
 alpha 256 256 512
 // small sparks which form a sphere as they slow down
 effect TE_PLASMABURN
-count 256
+count 128
 type spark
 color 0x2030FF 0x80C0FF
 size 1 2
@@ -549,7 +549,7 @@ lightcolor 2 2 2
 // quake effect
 // used nowhere in code
 effect TE_FLAMEJET
-count 1
+count 0.5
 type smoke
 color 0x6f0f00 0xe3974f
 size 4 4
@@ -564,7 +564,7 @@ velocitymultiplier 1
 // quake effect
 // used nowhere in code
 effect TE_LAVASPLASH
-count 64
+count 32
 type alphastatic
 color 0x6f0f00 0xe3974f
 size 12 12
@@ -578,7 +578,7 @@ velocityjitter 128 128 0
 // player teleport effect
 // used nowhere in code
 effect TE_TELEPORT
-count 112
+count 56
 type static
 color 0xA0A0A0 0xFFFFFF
 size 10 10
@@ -601,7 +601,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3
-trailspacing 2
+trailspacing 4
 type static
 color 0x202020 0x404040
 size 1 1
@@ -614,7 +614,7 @@ type smoke
 // smoke effect
 // used nowhere in code
 effect TE_TEI_SMOKE
-count 0.333
+count 0.167
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -648,7 +648,7 @@ alpha 192 192 64
 // fire effect
 effect TE_TEI_BIGEXPLOSION
 notunderwater
-count 256
+count 128
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -662,7 +662,7 @@ velocityjitter 512 512 512
 // underwater bubbles
 effect TE_TEI_BIGEXPLOSION
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -676,7 +676,7 @@ velocityjitter 144 144 144
 // bouncing sparks
 effect TE_TEI_BIGEXPLOSION
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -711,7 +711,7 @@ size 32 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect TE_TEI_PLASMAHIT
-count 1
+count 0.5
 type spark
 color 0x2030FF 0x80C0FF
 size 2 4
@@ -739,7 +739,7 @@ velocityjitter 512 512 512
 // used in qcsrc/client/gibs.qc:       pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("blood"), org, vel, amount * 16)
 effect blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -767,7 +767,7 @@ originjitter 11 11 11
 // used in qcsrc/server/t_teleporters.qc:              pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1)
 // used in qcsrc/server/t_teleporters.qc:              pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1)
 effect teleport
-count 1000
+count 500
 type spark
 tex 64 64
 color 0xff8400 0xff2a00
@@ -795,7 +795,7 @@ color 0xff8400 0xff2a00
 // normal super gory blood trail (used by gibs)
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_BLOOD"), oldorg, self.origin)
 effect TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
@@ -814,7 +814,7 @@ staintex 16 24
 // thinner blood trail (used by quake zombies)
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin)
 effect TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
@@ -834,7 +834,7 @@ staintex 16 24
 // used in qcsrc/server/g_triggers.qc: self.effects = EF_STARDUST
 // used in qcsrc/server/portals.qc:    portal.effects = EF_STARDUST | EF_BLUE
 effect EF_STARDUST
-count 75
+count 37.5
 type static
 color 0xfff368 0xfff368
 size 1.0 2.0
@@ -859,7 +859,7 @@ size 32 32
 alpha 128 128 128
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_respawn
-count 256
+count 128
 type spark
 tex 41 41
 color 0x63F2EA 0x63f2EA
@@ -897,7 +897,7 @@ lightradiusfade 2000
 lightcolor 3 0.1 0.1
 // electricity
 effect laser_muzzleflash
-count 6
+count 3
 type spark
 color 0xb44215 0xff0000
 tex 43 43
@@ -912,7 +912,7 @@ stretchfactor 2.3
 rotate -180 180 4000 -4000
 // fire
 effect laser_muzzleflash
-count 12
+count 6
 type spark
 color 0xff4200 0xff0000
 tex 8 15
@@ -949,7 +949,7 @@ alpha 256 256 1024
 size 24 24
 // sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
 effect laser_impact
-count 256
+count 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 1024
@@ -960,7 +960,7 @@ liquidfriction 6
 //originjitter 32 32 32
 velocityjitter 256 256 256
 effect laser_impact
-count 8
+count 4
 type smoke
 tex 48 55
 color 0x800000 0xFF8020
@@ -977,7 +977,7 @@ sizeincrease 6
 // used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo"))
 // used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"))
 effect shotgun_muzzleflash
-count 3
+count 1.5
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -992,7 +992,7 @@ lightcolor 2 1.5 0.2
 sizeincrease 12
 velocitymultiplier 0.05
 effect shotgun_muzzleflash
-count 32
+count 16
 type spark
 tex 48 55
 color 0xffdb96 0xff5400
@@ -1022,7 +1022,7 @@ effect shotgun_impact
 type alphastatic
 notunderwater
 tex 0 8
-count 6
+count 3
 size 10 20
 sizeincrease 25
 alpha 300 550 756
@@ -1036,7 +1036,7 @@ effect shotgun_impact
 type alphastatic
 notunderwater
 tex 36 36
-count 1
+count 0.5
 size 10 11
 sizeincrease 74
 alpha 200 350 500
@@ -1049,7 +1049,7 @@ rotate 0 360 -50 50
 // sparks
 effect shotgun_impact
 notunderwater
-count 3
+count 1.5
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -1065,7 +1065,7 @@ velocitymultiplier 0.2
 
 // used in qcsrc/server/w_uzi.qc:      pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect uzi_muzzleflash
-count 2
+count 1
 type static
 color 0x202020 0x404040
 tex 0 8
@@ -1079,7 +1079,7 @@ lightradiusfade 2000
 lightcolor 2 1.5 0.2
 gravity -0.1
 effect uzi_muzzleflash
-count 20
+count 10
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -1110,7 +1110,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 0 8
-count 6
+count 3
 size 10 20
 sizeincrease 15
 alpha 300 550 456
@@ -1124,7 +1124,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 36 36
-count 1
+count 0.5
 size 10 11
 sizeincrease 74
 alpha 200 350 500
@@ -1139,7 +1139,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 66 68
-count 2
+count 1
 size 1 5
 airfriction 1
 gravity 1.4
@@ -1152,7 +1152,7 @@ rotate 0 360 -500 500
 // sparks
 effect machinegun_impact
 notunderwater
-count 2
+count 1
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -1173,7 +1173,7 @@ velocitymultiplier 0.2
 // used in qcsrc/server/w_grenadelauncher.qc:  pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_porto.qc:    //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect grenadelauncher_muzzleflash
-count 3
+count 1.5
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1187,7 +1187,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect grenadelauncher_muzzleflash
-count 32
+count 16
 type spark
 tex 48 55
 color 0xffdb96 0xff5400
@@ -1206,7 +1206,7 @@ stretchfactor 2.5
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
 effect TR_GRENADE
-trailspacing 2
+trailspacing 4
 type smoke
 color 0x101010 0x000000
 tex 0 8
@@ -1221,7 +1221,7 @@ velocitymultiplier -0.02
 // fire
 effect TR_GRENADE
 notunderwater
-trailspacing 2
+trailspacing 4
 type static
 color 0xffdf72 0x811200
 tex 48 55
@@ -1234,7 +1234,7 @@ velocitymultiplier -1.0
 // bubbles
 effect TR_GRENADE
 underwater
-trailspacing 8
+trailspacing 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1254,7 +1254,7 @@ velocityjitter 16 16 16
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)
 effect TR_KNIGHTSPIKE // used for MF_TRACER2
 notunderwater
-trailspacing 3
+trailspacing 6
 type smoke
 color 0x303030 0x000000
 tex 0 8
@@ -1273,12 +1273,12 @@ color 0x666666 0x000000
 tex 62 62
 size 1 1
 sizeincrease -0.1
-trailspacing 1
+trailspacing 2
 alpha 256 256 720
 // bubbles
 effect TR_KNIGHTSPIKE // used for MF_TRACER2
 underwater
-trailspacing 16
+trailspacing 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1306,7 +1306,7 @@ lightcolor 8 4 1
 // fire effect which expands then slows
 effect grenade_explode
 notunderwater
-count 80
+count 40
 type static
 tex 48 55
 color 0xe03f00 0x5e0000
@@ -1321,7 +1321,7 @@ velocityjitter 256 256 256
 // fire effect which make brigt dot inside
 effect grenade_explode
 notunderwater
-count 30
+count 15
 type static
 tex 48 55
 color 0xe03f00 0xffdf92
@@ -1338,7 +1338,7 @@ effect grenade_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 20
+count 10
 size 20 40
 sizeincrease 34
 alpha 300 550 556
@@ -1349,7 +1349,7 @@ bounce 6
 // underwater bubbles
 effect grenade_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1374,7 +1374,7 @@ velocitymultiplier 0.3
 // bouncing sparks
 effect grenade_explode
 notunderwater
-count 32
+count 16
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -1390,7 +1390,7 @@ velocityjitter 424 424 624
 // derbis
 effect grenade_explode
 notunderwater
-count 24
+count 12
 type alphastatic
 tex 66 68
 color 0x6a3d25 0xcac5b4
@@ -1422,7 +1422,7 @@ lightradiusfade 2000
 lightcolor 1.5 3 6
 
 effect electro_muzzleflash
-count 14
+count 7
 type spark
 tex 8 15
 color 0xD9FDFF 0xD9FDFF
@@ -1435,7 +1435,7 @@ airfriction 2
 stretchfactor 1.5
 
 effect electro_muzzleflash
-count 10
+count 5
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1453,7 +1453,7 @@ stretchfactor 0.1
 // glowing vapor trail
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
 effect TR_NEXUIZPLASMA
-trailspacing 1
+trailspacing 2
 type static
 color 0x283880 0x283880
 size 3 3
@@ -1466,8 +1466,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_NEXUIZPLASMA
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0x629dff 0x0018ff
@@ -1514,7 +1514,7 @@ size 12 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect electro_impact
-count 60
+count 30
 type smoke
 tex 42 42
 color 0x629dff 0x0018ff
@@ -1529,7 +1529,7 @@ velocityjitter 512 512 512
 rotate -180 180 -9999 9999
 // inner cloud of smoke
 effect electro_impact
-count 60
+count 30
 type smoke
 color 0x629dff 0x0018ff
 tex 0 8
@@ -1562,7 +1562,7 @@ size 32 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect electro_ballexplode
-count 128
+count 64
 type spark
 tex 41 41
 color 0xFDFFD9 0xFDFFD9
@@ -1575,7 +1575,7 @@ originjitter 1 1 1
 velocityjitter 512 512 512
 // inner cloud of smoke
 effect electro_ballexplode
-count 16
+count 8
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1608,7 +1608,7 @@ size 48 48
 alpha 128 128 64
 // large sparks
 effect electro_combo
-count 10
+count 5
 type static
 color 0x2030FF 0x80C0FF
 size 32 32
@@ -1621,7 +1621,7 @@ liquidfriction 16
 //velocityoffset 0 0 120
 velocityjitter 512 512 512
 effect electro_combo
-count 64
+count 32
 type spark
 tex 41 41
 color 0xa9cacf 0x0054ff
@@ -1636,7 +1636,7 @@ originjitter 1 1 1
 velocityjitter 312 312 312
 // inner cloud of smoke
 effect electro_combo
-count 0.25
+count 0.125
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1660,7 +1660,7 @@ velocitymultiplier 0.3
 // used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)
 // used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)
 effect crylink_muzzleflash
-count 1
+count 0.5
 type smoke
 color 0xdd9cff 0xff0090
 tex 65 65
@@ -1671,7 +1671,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 1.6 0.2 2
 effect crylink_muzzleflash
-count 10
+count 5
 type spark
 tex 35 36
 color 0xA080C0 0xA080C0
@@ -1707,7 +1707,7 @@ size 8 8
 alpha 256 256 512
 // purple sparks
 effect crylink_impact
-count 20
+count 10
 type spark
 tex 41 41
 color 0xA040C0 0xA040C0
@@ -1717,7 +1717,7 @@ alpha 256 256 1024
 velocityjitter 256 256 256
 // purple splash
 effect crylink_impact
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 8 8
@@ -1725,7 +1725,7 @@ alpha 256 256 512
 velocityjitter 8 8 8
 // purple splash
 effect crylink_impact
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 8 8
@@ -1737,7 +1737,7 @@ velocityjitter 32 32 32
 // used in qcsrc/server/w_minstanex.qc:        pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/client/particles.qc:  pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1)
 effect nex_muzzleflash
-count 24
+count 12
 type spark
 color 0x202020 0x0072ff
 tex 48 55
@@ -1753,7 +1753,7 @@ lightradius 200
 lightradiusfade 200
 lightcolor 2 2.5 3
 effect nex_muzzleflash
-count 100
+count 50
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1777,7 +1777,7 @@ airfriction 9
 // nex beam: ring smoke
 // used in qcsrc/client/particles.qc:          trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos)
 effect nex_beam
-trailspacing 32
+trailspacing 64
 color 0x1680A0 0x1680A0
 size 4 4
 tex 32 32
@@ -1787,7 +1787,7 @@ sizeincrease 2
 type static
 // nex beam: drifting smoke
 effect nex_beam
-trailspacing 6
+trailspacing 12
 color 0x5080A0 0x5080A0
 size 1 1
 tex 0 8
@@ -1798,7 +1798,7 @@ velocityjitter 64 64 64
 type static
 // nex beam: bright core
 effect nex_beam
-trailspacing 6
+trailspacing 12
 color 0x80CDFF 0x80CDFF
 size 4 4
 //tex 48 55
@@ -1806,7 +1806,7 @@ alpha 256 256 1280
 type static
 //sparks
 effect nex_beam
-trailspacing 8
+trailspacing 16
 color 0x1680A0 0x1680A0
 size 1 1
 tex 63 63
@@ -1832,7 +1832,7 @@ lightcolor 4 6 8
 rotate -180 180 0 0
 // rotating something
 effect nex_impact
-count 10
+count 5
 type smoke
 tex 46 46
 color 0x1680A0 0x1680A0
@@ -1880,7 +1880,7 @@ alpha 256 256 256
 //velocityjitter 384 384 384
 // small sparks which glow brightly but live briefly
 effect nex_impact
-count 128
+count 64
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1893,7 +1893,7 @@ velocitymultiplier 0.5
 airfriction 9
 // small sparks that live longer
 effect nex_impact
-count 32
+count 16
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1910,7 +1910,7 @@ gravity 1
 // used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_seeker.qc:   pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect hagar_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1923,7 +1923,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect hagar_muzzleflash
-count 30
+count 15
 type spark
 tex 48 55
 color 0xff8400 0xff4200
@@ -1940,7 +1940,7 @@ rotate -180 180 -400 400
 
 // used in qcsrc/server/w_hagar.qc:            pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1)
 effect hagar_bounce
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1953,7 +1953,7 @@ lightradius 60
 lightradiusfade 300
 lightcolor 2 1.5 0.2
 effect hagar_bounce
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -1985,7 +1985,7 @@ lightcolor 8 4 1
 // fire effect which make bright dot inside
 effect hagar_explode
 notunderwater
-count 10
+count 5
 type smoke
 tex 48 55
 color 0xffe955 0xff5a00
@@ -2000,7 +2000,7 @@ velocityjitter 156 156 156
 // fire effect which expands then slows
 effect hagar_explode
 notunderwater
-count 24
+count 12
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -2018,7 +2018,7 @@ effect hagar_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 20
+count 10
 size 20 40
 sizeincrease 20
 alpha 200 500 600
@@ -2030,7 +2030,7 @@ bounce 2
 // underwater bubbles
 effect hagar_explode
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2044,7 +2044,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect hagar_explode
 notunderwater
-count 8
+count 4
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -2062,7 +2062,7 @@ velocityjitter 224 224 224
 
 // used in qcsrc/server/w_rocketlauncher.qc:   pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect rocketlauncher_muzzleflash
-count 20
+count 10
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -2077,7 +2077,7 @@ velocitymultiplier -0.13
 //lightradiusfade 2000
 //lightcolor 2 1.5 0.2
 effect rocketlauncher_muzzleflash
-count 12
+count 6
 type smoke
 tex 35 36
 color 0xFFFDD9 0xFFFDD9
@@ -2099,7 +2099,7 @@ rotate -180 180 -30 30
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
 effect TR_ROCKET
-trailspacing 5
+trailspacing 10
 type smoke
 notunderwater
 color 0x000000 0x666666
@@ -2118,7 +2118,7 @@ rotate -180 180 -30 30
 //gravity -0.11
 // fire
 effect TR_ROCKET
-trailspacing 2
+trailspacing 4
 type static
 color 0xffdf72 0x811200
 tex 48 55
@@ -2132,7 +2132,7 @@ velocitymultiplier -1.5
 effect TR_ROCKET
 type bubble
 underwater
-trailspacing 8
+trailspacing 16
 tex 62 62
 size 1 2
 alpha 256 256 256
@@ -2145,7 +2145,7 @@ rotate 0 0 0 0
 // sparks
 effect TR_ROCKET
 notunderwater
-trailspacing 10
+trailspacing 20
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -2174,7 +2174,7 @@ lightcolor 8 4 1
 // fire effect
 effect rocket_explode
 notunderwater
-count 64
+count 32
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -2189,7 +2189,7 @@ velocityjitter 512 512 512
 // fire effect 2
 effect rocket_explode
 notunderwater
-count 28
+count 14
 type smoke
 tex 48 55
 color 0xea691b 0xeed05a
@@ -2206,7 +2206,7 @@ effect rocket_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 64
+count 32
 size 20 40
 sizeincrease 44
 alpha 200 450 456
@@ -2217,7 +2217,7 @@ bounce 2
 // underwater bubbles
 effect rocket_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2241,7 +2241,7 @@ velocitymultiplier 0.3
 // bouncing sparks
 effect rocket_explode
 notunderwater
-count 32
+count 16
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -2257,7 +2257,7 @@ velocityjitter 424 424 624
 // derbis
 effect rocket_explode
 notunderwater
-count 24
+count 12
 type alphastatic
 tex 66 68
 color 0x6a3d25 0xcac5b4
@@ -2297,7 +2297,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2321,7 +2321,7 @@ sizeincrease 0.1
 
 // used nowhere in code
 effect nex242_misc_laser_beam_fast_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2344,7 +2344,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_green_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2366,7 +2366,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_blue_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2388,7 +2388,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_yellow_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2410,7 +2410,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_cyan_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2432,7 +2432,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_magenta_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2454,7 +2454,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_white_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2476,7 +2476,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_black_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2498,7 +2498,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_orange_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2534,7 +2534,7 @@ size 24 24
 alpha 256 256 512
 // purple sparks
 effect crylink_impactbig
-count 80
+count 40
 type spark
 tex 41 41
 color 0xA040C0 0xA040C0
@@ -2544,7 +2544,7 @@ alpha 256 256 1024
 velocityjitter 512 512 512
 // purple splash
 effect crylink_impactbig
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 16 16
@@ -2552,7 +2552,7 @@ alpha 256 256 512
 velocityjitter 32 32 32
 // purple splash
 effect crylink_impactbig
-count 6
+count 3
 type static
 color 0xE070FF 0xE070FF
 size 16 16
@@ -2565,7 +2565,7 @@ velocityjitter 256 256 256
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 16 16
@@ -2578,7 +2578,7 @@ liquidfriction 10
 velocityjitter 256 256 256
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 16 16
@@ -2591,7 +2591,7 @@ liquidfriction 10
 velocityjitter 256 256 256
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 16 16
@@ -2610,7 +2610,7 @@ velocityjitter 256 256 256
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 32 32
@@ -2623,7 +2623,7 @@ liquidfriction 6
 velocityjitter 512 512 512
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 32 32
@@ -2636,7 +2636,7 @@ liquidfriction 6
 velocityjitter 512 512 512
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 32 32
@@ -2661,7 +2661,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect laser_deadly
-count 0.05 // 50 per second
+count 0.025
 type smoke
 tex 48 55
 color 0xFFFFFF 0xFFFFFF
@@ -2676,7 +2676,7 @@ velocitymultiplier 20
 // sparks
 effect laser_deadly
 notunderwater
-count 0.05 // 50 per second
+count 0.025
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -2695,7 +2695,7 @@ velocitymultiplier 100
 // used nowhere in code
 effect torch_small
 //notunderwater
-count 16
+count 8
 type smoke
 tex 48 55
 size 1 11
@@ -2709,7 +2709,7 @@ velocityjitter 1 1 50
 // smoke
 effect torch_small
 type alphastatic
-count 8
+count 4
 tex 0 8
 size 5 10
 sizeincrease 5
@@ -2723,7 +2723,7 @@ velocityjitter 11 11 50
 //fountain01
 // used nowhere in code
 effect fountain01
-count 32
+count 16
 tex 0 8
 size 10 15
 alpha 0 100 100
@@ -2740,7 +2740,7 @@ velocitymultiplier 2
 // decal
 // used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1)
 effect hookbomb_explode
-count 50
+count 25
 type static
 tex 38 38
 color 0x807aff 0x4463d5
@@ -2773,7 +2773,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // some sparks
 effect hookbomb_explode
-count 60
+count 30
 type spark
 tex 38 38
 color 0x807aff 0x4463d5
@@ -2791,7 +2791,7 @@ airfriction 2
 // smoke
 effect EF_MGTURRETTRAIL
 notunderwater
-trailspacing 5
+trailspacing 10
 type smoke
 color 0xd0d0a0 0xffffff
 tex 0 8
@@ -2802,7 +2802,7 @@ gravity -0.01
 // bubbles
 effect EF_MGTURRETTRAIL
 underwater
-trailspacing 16
+trailspacing 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2818,7 +2818,7 @@ velocityjitter 16 16 16
 // used nowhere in code
 effect fire_big
 //notunderwater
-count 52
+count 26
 type smoke
 tex 48 55
 size 11 31
@@ -2832,7 +2832,7 @@ velocityjitter 22 22 50
 // smoke
 effect fire_big
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -2848,7 +2848,7 @@ bounce 2
 // used nowhere in code
 effect red_flare
 type alphastatic
-count 21
+count 10.5
 tex 0 8
 size 1 11
 sizeincrease 11
@@ -2864,7 +2864,7 @@ bounce 1
 // used nowhere in code
 effect blue_flare
 type alphastatic
-count 21
+count 10.5
 tex 0 8
 size 1 11
 sizeincrease 11
@@ -2880,7 +2880,7 @@ bounce 1
 // used in qcsrc/server/ctf.qc:                pointparticles(particleeffectnum("smoke_ring"), 0.5 * (self.absmin + self.absmax), '0 0 0', 1);
 effect smoke_ring
 type smoke
-count 90
+count 45
 tex 0 8
 size 1 11
 sizeincrease 21
@@ -2898,7 +2898,7 @@ notunderwater
 // used nowhere in code
 effect smoke_large
 type alphastatic
-count 50
+count 25
 tex 0 8
 size 11 21
 sizeincrease 21
@@ -2914,7 +2914,7 @@ notunderwater
 //sparks
 // used nowhere in code
 effect sparks
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -2930,7 +2930,7 @@ airfriction 3
 //sparks
 // used nowhere in code
 effect electricity_sparks
-count 70
+count 35
 type spark
 tex 40 40
 color 0x807aff 0x4463d5
@@ -2947,7 +2947,7 @@ airfriction 3
 // used nowhere in code
 effect steam
 type smoke
-count 2
+count 1
 tex 0 8
 size 1 3
 sizeincrease 7
@@ -2964,7 +2964,7 @@ notunderwater
 // smoke emiter
 // used nowhere in code
 effect smoking
-count 20
+count 10
 type alphastatic
 tex 0 8
 color 0x292929 0x000000
@@ -2981,7 +2981,7 @@ airfriction -1
 //golden dust (create it once per second to cover large area in small yellow particles)
 // used nowhere in code
 effect goldendust
-count 50
+count 25
 type snow
 tex 38 38
 color 0xff9600 0xffefb8
@@ -2997,7 +2997,7 @@ velocityjitter 0.1 0.1 0.1
 
 // used nowhere in code
 effect healing_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0xff0000 0xff0000
@@ -3013,7 +3013,7 @@ airfriction -0.5
 
 // used nowhere in code
 effect armorrepair_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0x00ff00 0x00ff00
@@ -3029,7 +3029,7 @@ airfriction -0.5
 
 // used nowhere in code
 effect ammoregen_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0x0000ff 0x0000ff
@@ -3046,7 +3046,7 @@ airfriction -0.5
 // red-yellow flame like fx
 // used nowhere in code
 effect rage
-count 5
+count 2.5
 type smoke
 tex 35 36
 color 0xff0000 0xff7800
@@ -3061,7 +3061,7 @@ airfriction 2
 // pieces of glass or ice falling on the floor
 // used nowhere in code
 effect iceorglass
-count 30
+count 15
 type alphastatic
 tex 44 44
 color 0xffffff 0xb2d3e6
@@ -3078,7 +3078,7 @@ airfriction 3
 // cover small area in poison gas, spawn it once per second
 // used nowhere in code
 effect poisonfield
-count 30
+count 15
 type smoke
 tex 0 8
 color 0x00ff00 0x7db843
@@ -3094,7 +3094,7 @@ airfriction 1
 // cover small area in icy mist, spawn it once per second
 // used nowhere in code
 effect icefield
-count 20
+count 10
 type smoke
 tex 0 8
 color 0x008aff 0x75e7ff
@@ -3107,7 +3107,7 @@ originjitter 333 333 0
 velocityjitter 5 5 30
 airfriction 1
 effect icefield
-count 10
+count 5
 type smoke
 tex 48 55
 size 1 1
@@ -3122,7 +3122,7 @@ originjitter 333 333 0
 // flames that go up
 // used nowhere in code
 effect firefield
-count 200
+count 100
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3136,7 +3136,7 @@ velocityjitter 5 5 30
 airfriction 1
 //flames that stay on the ground
 effect firefield
-count 100
+count 50
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3146,7 +3146,7 @@ alpha 50 256 200
 originjitter 180 180 0
 // smoke
 effect firefield
-count 40
+count 20
 type alphastatic
 tex 0 8
 size 1 1
@@ -3160,7 +3160,7 @@ originjitter 180 180 0
 //fast fire
 // used nowhere in code
 effect flamethrower
-count 6
+count 3
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3174,7 +3174,7 @@ velocitymultiplier 30
 airfriction 1.2
 //slowfire
 effect flamethrower
-count 5
+count 2.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3188,7 +3188,7 @@ velocitymultiplier 20
 airfriction 1.2
 // very slow and small fire
 effect flamethrower
-count 3
+count 1.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3202,7 +3202,7 @@ velocitymultiplier 10
 airfriction 0.3
 //decreasing fire
 effect flamethrower
-count 4
+count 2
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3216,7 +3216,7 @@ velocitymultiplier 15
 airfriction 0.3
 //smoke
 effect flamethrower
-count 1
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -3234,7 +3234,7 @@ airfriction 1
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
 effect TR_WIZSPIKE
-trailspacing 2
+trailspacing 4
 type static
 color 0x404040 0x404040
 size 3 3
@@ -3247,8 +3247,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_WIZSPIKE
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0x404040 0x404040
@@ -3266,7 +3266,7 @@ velocityjitter 50 50 50
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
 effect TR_VORESPIKE
-trailspacing 2
+trailspacing 4
 type static
 color 0x804000 0x804000
 size 3 3
@@ -3279,8 +3279,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_VORESPIKE
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0xff8000 0xff8000
@@ -3307,7 +3307,7 @@ lightcolor 8 4 1
 // fire effect which make bright dot inside
 effect flac_explode
 notunderwater
-count 6
+count 3
 type smoke
 tex 48 55
 color 0xffe955 0xff5a00
@@ -3322,7 +3322,7 @@ velocityjitter 156 156 156
 // fire effect which expands then slows
 effect flac_explode
 notunderwater
-count 12
+count 6
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3340,7 +3340,7 @@ effect flac_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 10
+count 5
 size 10 20
 sizeincrease 20
 alpha 500 600 556
@@ -3352,7 +3352,7 @@ bounce 2
 // underwater bubbles
 effect flac_explode
 underwater
-count 16
+count 8
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -3366,7 +3366,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect flac_explode
 notunderwater
-count 8
+count 4
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -3384,7 +3384,7 @@ velocityjitter 256 256 256
 // used in qcsrc/server/w_common.qc:                           zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("tr_bullet"), from, to)
 effect tr_bullet
-trailspacing 128
+trailspacing 256
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
@@ -3395,7 +3395,7 @@ velocitymultiplier 0.7
 // smoke emitter for small pipes
 // used nowhere in code
 effect smoking_smallemitter
-count 20
+count 10
 type alphastatic
 tex 0 8
 color 0x292929 0x000000
@@ -3414,7 +3414,7 @@ airfriction -1
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
 effect TR_CRYLINKPLASMA
-trailspacing 64
+trailspacing 128
 type static
 color 0x5522aa 0x6622ff
 size 2 2
@@ -3428,7 +3428,7 @@ velocityjitter 8 8 8
 velocitymultiplier -0.01
 // crylink main trail
 effect TR_CRYLINKPLASMA
-trailspacing 8
+trailspacing 16
 type static
 color 0x5522aa 0x6622ff
 size 3 3
@@ -3439,7 +3439,7 @@ velocityjitter 2 2 2
 velocitymultiplier 0.01
 
 effect cherryblossom
-count 3
+count 1.5
 type static
 color 0xb123ff 0xb183ff
 size 1.5 2
@@ -3455,7 +3455,7 @@ tex 40 40
 //lighttime 0
 
 effect alien_blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -3479,7 +3479,7 @@ color 0x000000 0x204010
 originjitter 11 11 11
 
 effect robot_blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -3504,7 +3504,7 @@ originjitter 11 11 11
 
 
 effect alien_TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xC080B0 0xC080B0
 tex 24 32
@@ -3519,7 +3519,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect robot_TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xC0D890 0xC0D890
 tex 24 32
@@ -3534,7 +3534,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect alien_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC080B0 0xC080B0
 tex 24 32
@@ -3549,7 +3549,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect robot_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC0D890 0xC0D890
 tex 24 32
@@ -3573,7 +3573,7 @@ size 8 16
 alpha 128 64 64
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_pickup
-count 64
+count 32
 type spark
 tex 41 41
 color 0x63F2EA 0xB0C5C4
@@ -3633,7 +3633,7 @@ staintex 16 24
 // used in qsrc/server/ctf.qc:         pointparticles(particleeffectnum("red_ground_quake"), self.origin, '0 0 0', 1);
 effect red_ground_quake
 type smoke
-count 180
+count 90
 tex 0 8
 size 20 50
 sizeincrease 100
@@ -3648,7 +3648,7 @@ bounce 1.1
 notunderwater
 effect red_ground_quake
 type smoke
-count 80
+count 40
 tex 0 8
 size 10 30
 sizeincrease 60
@@ -3663,7 +3663,7 @@ bounce 1.2
 notunderwater
 effect red_ground_quake
 //notunderwater
-count 32
+count 16
 type smoke
 tex 48 55
 size 4 20
@@ -3678,7 +3678,7 @@ velocityjitter 22 22 50
 // smoke
 effect red_ground_quake
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -3695,7 +3695,7 @@ bounce 2
 // used in qsrc/server/ctf.qc:         pointparticles(particleeffectnum("blue_ground_quake"), self.origin, '0 0 0', 1);
 effect blue_ground_quake
 type smoke
-count 180
+count 90
 tex 0 8
 size 20 50
 sizeincrease 100
@@ -3710,7 +3710,7 @@ bounce 1.1
 notunderwater
 effect blue_ground_quake
 type smoke
-count 80
+count 40
 tex 0 8
 size 10 30
 sizeincrease 60
@@ -3725,7 +3725,7 @@ bounce 1.2
 notunderwater
 effect blue_ground_quake
 //notunderwater
-count 32
+count 16
 type smoke
 tex 48 55
 size 4 20
@@ -3740,7 +3740,7 @@ velocityjitter 22 22 50
 // smoke
 effect blue_ground_quake
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -3759,7 +3759,7 @@ bounce 2
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect morphed_damage_hit
 tex 43 43
-count 1
+count 0.5
 type spark
 color 0xffffff 0x9271fb
 size 14 24
@@ -3772,7 +3772,7 @@ velocityjitter 356 356 456
 
 effect morphed_damage_hit
 tex 0 8
-count 1
+count 0.5
 type smoke
 color 0xffffff 0x9271fb
 size 24 24
@@ -3790,7 +3790,7 @@ originjitter 10 10 10
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect morphed_damage_dissolve
 tex 43 43
-count 20
+count 10
 type smoke
 color 0xffffff 0x9271fb
 size 40 40
@@ -3804,7 +3804,7 @@ rotate -180 180 -399 -99
 
 effect morphed_damage_dissolve
 tex 43 43
-count 5
+count 2.5
 type smoke
 color 0x7bdbff 0xbed2ff
 size 40 40
@@ -3818,7 +3818,7 @@ rotate -180 180 0 0
 
 effect morphed_damage_dissolve
 tex 65 65
-count 10
+count 5
 type smoke
 color 0xffffff 0x9271fb
 size 44 44
@@ -3830,7 +3830,7 @@ originjitter 22 22 76
 
 effect morphed_damage_dissolve
 tex 46 46
-count 30
+count 15
 type smoke
 color 0xffffff 0x9271fb
 size 32 32
@@ -3853,7 +3853,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3RED
-trailspacing 4
+trailspacing 8
 type static
 color 0x200000 0x400000
 size 0.3 0.3
@@ -3874,7 +3874,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3RED_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xFF0011
 size 2 2
@@ -3886,7 +3886,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3RED_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xFF0000 0xFF0011
 size 10 10 
@@ -3905,7 +3905,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3BLUE
-trailspacing 4
+trailspacing 8
 type static
 color 0x000020 0x000040
 size 0.3 0.3
@@ -3926,7 +3926,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3BLUE_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0x100FF
 size 2 2
@@ -3938,7 +3938,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3BLUE_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0x0000FF 0x1100FF
 size 10 10 
@@ -3957,7 +3957,7 @@ color 0xffff00 0xffff11
 size 4 4
 alpha 128 128 256
 effect TE_TEI_G3YELLOW
-trailspacing 4
+trailspacing 8
 type static
 color 0x202000 0x404000
 size 0.3 0.3
@@ -3976,7 +3976,7 @@ color 0xffff00 0xffff11
 size 8 8
 alpha 128 128 256
 effect TE_TEI_G3YELLOW_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xffff10
 size 2 2
@@ -3987,7 +3987,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3YELLOW_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xffff00 0xffff11
 size 10 10 
@@ -4008,7 +4008,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3PINK
-trailspacing 4
+trailspacing 8
 type static
 color 0x200020 0x400040
 size 0.3 0.3
@@ -4029,7 +4029,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3PINK_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xFF10FF
 size 2 2
@@ -4041,7 +4041,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3PINK_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xFF00FF 0xFF11FF
 size 10 10 
@@ -4060,7 +4060,7 @@ type smoke
 // core decal
 effect particlegibs_damage_hit
 type blood
-count 1
+count 0.5
 tex 0 8
 size 5 10
 color 0xA8FFFF 0xA8FFFFF
@@ -4075,7 +4075,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4092,7 +4092,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4116,7 +4116,7 @@ staintex 16 24
 // small core blood no decals
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 0 8
 size 15 20
 color 0x00ffff 0x82ffff
@@ -4131,7 +4131,7 @@ staintex 16 24
 // core decal
 effect particlegibs_damage_dissolve
 type blood
-count 24
+count 12
 tex 0 8
 size 20 40
 color 0xA8FFFF 0xA8FFFFF
@@ -4147,7 +4147,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4165,7 +4165,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4183,7 +4183,7 @@ staintex 16 24
 // small bits
 effect particlegibs_damage_dissolve
 type blood
-count 150
+count 75
 tex 24 32
 size 1 1
 color 0xA8FFFF 0xA8FFFFF
@@ -4200,7 +4200,7 @@ staintex 16 24
 // fire effect which expands then slows
 effect onslaught_generator_gib_explode
 notunderwater
-count 34
+count 17
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4218,7 +4218,7 @@ effect onslaught_generator_gib_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 12
+count 6
 size 1 10
 sizeincrease 90
 gravity -0.3
@@ -4231,7 +4231,7 @@ bounce 2
 // underwater bubbles
 effect onslaught_generator_gib_explode
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4246,7 +4246,7 @@ velocityjitter 96 96 96
 // fire effect which expands then slows
 effect onslaught_generator_gib_flame
 notunderwater
-count 30
+count 15
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4263,7 +4263,7 @@ effect onslaught_generator_gib_flame
 type alphastatic
 notunderwater
 tex 0 8
-count 2
+count 1
 size 10 20
 sizeincrease 30
 gravity -0.8
@@ -4276,7 +4276,7 @@ bounce 2
 // underwater bubbles
 effect onslaught_generator_gib_flame
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4291,8 +4291,8 @@ velocityjitter 96 96 96
 
 // used nowhere in code
 effect firemine
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4305,8 +4305,8 @@ velocityjitter 10 10 2
 airfriction 1.2
 //slowfire
 effect firemine
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4319,8 +4319,8 @@ velocityjitter 10 10 10
 airfriction 1.2
 // very slow and small fire
 effect firemine
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4333,8 +4333,8 @@ velocityjitter 8 8 8
 airfriction 0.3
 //decreasing fire
 effect firemine
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4347,8 +4347,8 @@ velocityjitter 3 3 3
 airfriction 0.3
 //smoke
 effect firemine
-trailspacing 4
-count 1
+trailspacing 8
+count 0.5
 type alphastatic
 tex 0 8
 size 1 4
@@ -4361,8 +4361,8 @@ velocityoffset 0 0 3
 airfriction 1
 //fastfire
 effect firemine
-trailspacing 0.5
-count 1
+trailspacing 1
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4375,15 +4375,15 @@ velocityjitter 0 0 0
 airfriction 1.2
 // light only
 effect firemine
-trailspacing 8
+trailspacing 16
 lightradius 50
 lightradiusfade 50000
 lightcolor 2.7 2.7 0.6
 
 // used nowhere in code
 effect fireball
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4396,8 +4396,8 @@ velocityjitter 40 40 11
 airfriction 1.2
 //slowfire
 effect fireball
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4410,8 +4410,8 @@ velocityjitter 40 40 40
 airfriction 1.2
 // very slow and small fire
 effect fireball
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4424,8 +4424,8 @@ velocityjitter 30 30 30
 airfriction 0.3
 //decreasing fire
 effect fireball
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4438,8 +4438,8 @@ velocityjitter 10 10 10
 airfriction 0.3
 //smoke
 effect fireball
-trailspacing 4
-count 1
+trailspacing 8
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -4452,8 +4452,8 @@ velocityoffset 0 0 10
 airfriction 1
 //fastfire
 effect fireball
-trailspacing 0.5
-count 1
+trailspacing 1
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4466,14 +4466,14 @@ velocityjitter 0 0 0
 airfriction 1.2
 // light only
 effect fireball
-trailspacing 8
+trailspacing 16
 lightradius 300
 lightradiusfade 3000
 lightcolor 2.7 2.7 0.6
 
 // fireball
 effect fireball_laser
-count 20
+count 10
 type spark
 color 0x800000 0xFF8020
 alpha 192 256 2560
@@ -4506,7 +4506,7 @@ alpha 192 192 64
 // fire effect
 effect fireball_explode
 notunderwater
-count 256
+count 128
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -4520,7 +4520,7 @@ velocityjitter 512 512 512
 // underwater bubbles
 effect fireball_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4534,7 +4534,7 @@ velocityjitter 144 144 144
 // bouncing sparks
 effect fireball_explode
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -4547,7 +4547,7 @@ velocityoffset 0 0 80
 velocityjitter 384 384 384
 
 effect fireball_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4560,7 +4560,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_muzzleflash
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4572,7 +4572,7 @@ velocitymultiplier 0.5
 airfriction 12
 
 effect fireball_preattack_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4585,7 +4585,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_preattack_muzzleflash
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4597,7 +4597,7 @@ velocitymultiplier 0.5
 airfriction 12
 
 effect fireball_bfgdamage
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4610,7 +4610,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_bfgdamage
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4626,7 +4626,7 @@ airfriction 12
 // used nowhere in code
 effect EF_FLAME
 //notunderwater
-count 200
+count 100
 type smoke
 tex 48 55
 size 5 21
@@ -4641,7 +4641,7 @@ velocityjitter 22 22 50
 // smoke
 effect EF_FLAME
 type alphastatic
-count 100
+count 50
 tex 0 8
 size 11 15
 sizeincrease 6
@@ -4653,7 +4653,7 @@ originjitter 12 12 34
 velocityjitter 11 11 50
 bounce 2
 effect EF_FLAME
-count 1
+count 0.5
 lightradius 200
 lightradiusfade 10000
 lightcolor 0.9 0.9 0.2
@@ -4662,7 +4662,7 @@ lightcolor 0.9 0.9 0.2
 // used in qcsrc/server/w_common.qc:                           zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("tr_bullet"), from, to)
 effect tr_rifle
-trailspacing 128
+trailspacing 256
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
@@ -4672,7 +4672,7 @@ velocitymultiplier 0.7
 effect tr_rifle
 notunderwater
 tex 0 8
-trailspacing 8
+trailspacing 16
 type static
 color 0x202020 0x404040
 size 2 2
@@ -4683,7 +4683,7 @@ velocityjitter 4 4 4
 type smoke
 effect tr_rifle
 underwater
-trailspacing 32
+trailspacing 64
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4700,7 +4700,7 @@ velocityjitter 16 16 16
 // underwater bubbles
 effect rocket_guide
 underwater
-count 4
+count 2
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4715,7 +4715,7 @@ velocitymultiplier -0.1
 // bouncing sparks
 effect rocket_guide
 notunderwater
-count 16
+count 8
 type spark
 color 0x903010 0xFFD030
 size 0.3 0.7
@@ -4744,7 +4744,7 @@ alpha 100 100 500
 // used in qcsrc/server/w_laser.qc
 effect laser_gauntlet
 tex 43 43
-count 3
+count 1.5
 type spark
 color 0xff00ff 0xff0000
 size 4 8
@@ -4760,7 +4760,7 @@ velocityjitter 50 50 50
 //fast fire
 // used nowhere in code, meant for maps
 effect torchflame
-count 6
+count 3
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4773,7 +4773,7 @@ velocitymultiplier 30
 airfriction 1.2
 //slowfire
 effect torchflame
-count 5
+count 2.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4786,7 +4786,7 @@ velocitymultiplier 20
 airfriction 1.2
 // very slow and small fire
 effect torchflame
-count 3
+count 1.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4799,7 +4799,7 @@ velocitymultiplier 10
 airfriction 0.3
 //decreasing fire
 effect torchflame
-count 4
+count 2
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4812,7 +4812,7 @@ velocitymultiplier 15
 airfriction 0.3
 //smoke
 effect torchflame
-count 1
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -4828,7 +4828,7 @@ airfriction 1
 //happy death fx for cl_gentle
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 32 32
@@ -4841,7 +4841,7 @@ liquidfriction 6
 velocityjitter 312 312 312
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 32 32
@@ -4854,7 +4854,7 @@ liquidfriction 6
 velocityjitter 312 312 312
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 32 32
@@ -4870,7 +4870,7 @@ velocityjitter 312 312 312
 //happy damage fx for cl_gentle
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 26 26
@@ -4883,7 +4883,7 @@ liquidfriction 10
 velocityjitter 156 156 156
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 26 26
@@ -4896,7 +4896,7 @@ liquidfriction 10
 velocityjitter 156 156 156
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 26 26
index ea74e6054002d4d308dd27ac6b1a56501f076d95..676e958dfd0595b8e6a39b70b45e8f03071373ae 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 4
-cl_particles_quality 0.75
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 16
index c75e3831fa4095cbf73a31c1d332a0932a06e487..82da91797be410e7a70e96c60f88e66f598afd89 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.2
+cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 2
 gl_texture_anisotropy 1
index 6b8b28af23e9fe13e8048ae69c9b9d15366b564d..9b2a8b38da68239186fc7f80087c047e666a6e5a 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.5
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 1
index fe6ebdab599a3e757e291c1bf6d531047a7fddfb..7c49b57c620d713749d3220b7d22d4b022967f89 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.5
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 1
index b5832135e8b04f94a0db7f3d91456f8f4b49b491..8bae286c34f91a56580f15e90ee23febf6472df6 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 0
 cl_decals_time 2
-cl_particles_quality 0.2
+cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 1337
 gl_texture_anisotropy 1
diff --git a/gfx/brand.tga b/gfx/brand.tga
deleted file mode 100644 (file)
index d2e88c2..0000000
Binary files a/gfx/brand.tga and /dev/null differ
index 0ffc127cba46eee3c50f40afea0fa0e635a473b8..5442fa5d508a6bd31e10cdf11558187f2f896f22 100644 (file)
Binary files a/models/items/a_bullets.md3 and b/models/items/a_bullets.md3 differ
index 0ffc127cba46eee3c50f40afea0fa0e635a473b8..5442fa5d508a6bd31e10cdf11558187f2f896f22 100644 (file)
Binary files a/models/items/a_bullets.mdl and b/models/items/a_bullets.mdl differ
index 64526355619a370f66056b7839b8ae73650ede1a..61384b5fe7d861ad0ce3ea0af0d34546d91f63de 100644 (file)
Binary files a/models/items/a_rockets.md3 and b/models/items/a_rockets.md3 differ
diff --git a/models/player/lurk.zym b/models/player/lurk.zym
deleted file mode 100644 (file)
index 7d1dec8..0000000
Binary files a/models/player/lurk.zym and /dev/null differ
diff --git a/models/player/lurk.zym_0.skin b/models/player/lurk.zym_0.skin
deleted file mode 100644 (file)
index eb9261f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,lurk
\ No newline at end of file
diff --git a/models/player/lurk.zym_0.sounds b/models/player/lurk.zym_0.sounds
deleted file mode 100644 (file)
index 8346c17..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: reptilian\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/reptilian/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/reptilian/coms/attackinfive 0\r
-coverme sound/player/reptilian/coms/coverme 0\r
-defend sound/player/reptilian/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/reptilian/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/reptilian/coms/incoming 0\r
-meet sound/player/reptilian/coms/meet 0\r
-needhelp sound/player/reptilian/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/reptilian/coms/seenflag 0\r
-taunt sound/player/reptilian/coms/taunt 3\r
-teamshoot sound/player/reptilian/coms/teamshoot 3\r
-death sound/player/reptilian/player/death 3\r
-drown sound/player/reptilian/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/reptilian/player/falling 0\r
-gasp sound/player/reptilian/player/gasp 0\r
-jump sound/player/reptilian/player/jump 0\r
-pain25 sound/player/reptilian/player/pain25 0\r
-pain50 sound/player/reptilian/player/pain50 0\r
-pain75 sound/player/reptilian/player/pain75 0\r
-pain100 sound/player/reptilian/player/pain100 0\r
diff --git a/models/player/lurk.zym_0.tga b/models/player/lurk.zym_0.tga
deleted file mode 100644 (file)
index fd55f55..0000000
Binary files a/models/player/lurk.zym_0.tga and /dev/null differ
diff --git a/models/player/lurk.zym_0.txt b/models/player/lurk.zym_0.txt
deleted file mode 100644 (file)
index a6cad8b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-name Lurk
-species alien
-weight 84
-age 47
-
-Reptilian Combatant
diff --git a/models/player/lurk.zym_1.skin b/models/player/lurk.zym_1.skin
deleted file mode 100644 (file)
index 0719e78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,reptile
\ No newline at end of file
diff --git a/models/player/lurk.zym_1.sounds b/models/player/lurk.zym_1.sounds
deleted file mode 100644 (file)
index 8346c17..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: reptilian\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/reptilian/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/reptilian/coms/attackinfive 0\r
-coverme sound/player/reptilian/coms/coverme 0\r
-defend sound/player/reptilian/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/reptilian/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/reptilian/coms/incoming 0\r
-meet sound/player/reptilian/coms/meet 0\r
-needhelp sound/player/reptilian/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/reptilian/coms/seenflag 0\r
-taunt sound/player/reptilian/coms/taunt 3\r
-teamshoot sound/player/reptilian/coms/teamshoot 3\r
-death sound/player/reptilian/player/death 3\r
-drown sound/player/reptilian/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/reptilian/player/falling 0\r
-gasp sound/player/reptilian/player/gasp 0\r
-jump sound/player/reptilian/player/jump 0\r
-pain25 sound/player/reptilian/player/pain25 0\r
-pain50 sound/player/reptilian/player/pain50 0\r
-pain75 sound/player/reptilian/player/pain75 0\r
-pain100 sound/player/reptilian/player/pain100 0\r
diff --git a/models/player/lurk.zym_1.tga b/models/player/lurk.zym_1.tga
deleted file mode 100644 (file)
index 18eb918..0000000
Binary files a/models/player/lurk.zym_1.tga and /dev/null differ
diff --git a/models/player/lurk.zym_1.txt b/models/player/lurk.zym_1.txt
deleted file mode 100644 (file)
index b3ec555..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-name Reptile
-species alien
-weight 80
-age 32
-
-Reptilian Combatant
diff --git a/models/player/lurk_lod1.zym b/models/player/lurk_lod1.zym
deleted file mode 100644 (file)
index f7520b2..0000000
Binary files a/models/player/lurk_lod1.zym and /dev/null differ
diff --git a/models/player/lurk_lod1.zym_0.skin b/models/player/lurk_lod1.zym_0.skin
deleted file mode 100644 (file)
index eb9261f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,lurk
\ No newline at end of file
diff --git a/models/player/lurk_lod1.zym_1.skin b/models/player/lurk_lod1.zym_1.skin
deleted file mode 100644 (file)
index 0719e78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,reptile
\ No newline at end of file
diff --git a/models/player/lurk_lod2.zym b/models/player/lurk_lod2.zym
deleted file mode 100644 (file)
index cb13808..0000000
Binary files a/models/player/lurk_lod2.zym and /dev/null differ
diff --git a/models/player/lurk_lod2.zym_0.skin b/models/player/lurk_lod2.zym_0.skin
deleted file mode 100644 (file)
index eb9261f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,lurk
\ No newline at end of file
diff --git a/models/player/lurk_lod2.zym_1.skin b/models/player/lurk_lod2.zym_1.skin
deleted file mode 100644 (file)
index 0719e78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-lurk,reptile
\ No newline at end of file
diff --git a/models/player/marine.zym b/models/player/marine.zym
deleted file mode 100644 (file)
index 1615af4..0000000
Binary files a/models/player/marine.zym and /dev/null differ
diff --git a/models/player/marine.zym_0.skin b/models/player/marine.zym_0.skin
deleted file mode 100644 (file)
index 936a454..0000000
+++ /dev/null
@@ -1 +0,0 @@
-marine,marine
\ No newline at end of file
diff --git a/models/player/marine.zym_0.sounds b/models/player/marine.zym_0.sounds
deleted file mode 100644 (file)
index 323b13c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: marine\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/marine/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/marine/coms/attackinfive 0\r
-coverme sound/player/marine/coms/coverme 0\r
-defend sound/player/marine/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/marine/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/marine/coms/incoming 0\r
-meet sound/player/marine/coms/meet 0\r
-needhelp sound/player/marine/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/marine/coms/seenflag 0\r
-taunt sound/player/marine/coms/taunt 3\r
-teamshoot sound/player/marine/coms/teamshoot 4\r
-death sound/player/marine/player/death 3\r
-drown sound/player/marine/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/marine/player/fall 1\r
-gasp sound/player/marine/player/gasp 0\r
-jump sound/player/marine/player/jump 0\r
-pain25 sound/player/marine/player/pain25 0\r
-pain50 sound/player/marine/player/pain50 0\r
-pain75 sound/player/marine/player/pain75 0\r
-pain100 sound/player/marine/player/pain100 0\r
diff --git a/models/player/marine.zym_0.tga b/models/player/marine.zym_0.tga
deleted file mode 100644 (file)
index f7efd21..0000000
Binary files a/models/player/marine.zym_0.tga and /dev/null differ
diff --git a/models/player/marine.zym_0.txt b/models/player/marine.zym_0.txt
deleted file mode 100644 (file)
index f7a8ec5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name Marine
-species human
-sex Male
-weight 93
-age 35
-
-Service Man
diff --git a/models/player/marine_lod1.zym b/models/player/marine_lod1.zym
deleted file mode 100644 (file)
index 38c687a..0000000
Binary files a/models/player/marine_lod1.zym and /dev/null differ
diff --git a/models/player/marine_lod1.zym_0.skin b/models/player/marine_lod1.zym_0.skin
deleted file mode 100644 (file)
index 936a454..0000000
+++ /dev/null
@@ -1 +0,0 @@
-marine,marine
\ No newline at end of file
diff --git a/models/player/marine_lod2.zym b/models/player/marine_lod2.zym
deleted file mode 100644 (file)
index b70070c..0000000
Binary files a/models/player/marine_lod2.zym and /dev/null differ
diff --git a/models/player/marine_lod2.zym_0.skin b/models/player/marine_lod2.zym_0.skin
deleted file mode 100644 (file)
index 936a454..0000000
+++ /dev/null
@@ -1 +0,0 @@
-marine,marine
\ No newline at end of file
diff --git a/models/player/nexus.zym b/models/player/nexus.zym
deleted file mode 100644 (file)
index 7843d43..0000000
Binary files a/models/player/nexus.zym and /dev/null differ
diff --git a/models/player/nexus.zym_0.skin b/models/player/nexus.zym_0.skin
deleted file mode 100644 (file)
index bccc864..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,nexus
\ No newline at end of file
diff --git a/models/player/nexus.zym_0.sounds b/models/player/nexus.zym_0.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r
diff --git a/models/player/nexus.zym_0.tga b/models/player/nexus.zym_0.tga
deleted file mode 100644 (file)
index cab6e0f..0000000
Binary files a/models/player/nexus.zym_0.tga and /dev/null differ
diff --git a/models/player/nexus.zym_0.txt b/models/player/nexus.zym_0.txt
deleted file mode 100644 (file)
index c33fc9f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-name Nexus
-species human
-weight 282
-age 313
-
-Nexuiz's Soldier
diff --git a/models/player/nexus.zym_1.skin b/models/player/nexus.zym_1.skin
deleted file mode 100644 (file)
index ac518a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,mulder
diff --git a/models/player/nexus.zym_1.sounds b/models/player/nexus.zym_1.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r
diff --git a/models/player/nexus.zym_1.tga b/models/player/nexus.zym_1.tga
deleted file mode 100644 (file)
index c6579f9..0000000
Binary files a/models/player/nexus.zym_1.tga and /dev/null differ
diff --git a/models/player/nexus.zym_1.txt b/models/player/nexus.zym_1.txt
deleted file mode 100644 (file)
index 4b6bfae..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-name Mulder
-species robot_solid
-weight 282
-age 313
-
-Nexuiz's Soldier
diff --git a/models/player/nexus.zym_2.skin b/models/player/nexus.zym_2.skin
deleted file mode 100644 (file)
index d9ec837..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,nexus
diff --git a/models/player/nexus.zym_3.skin b/models/player/nexus.zym_3.skin
deleted file mode 100644 (file)
index b045534..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbgreen
diff --git a/models/player/nexus.zym_4.skin b/models/player/nexus.zym_4.skin
deleted file mode 100644 (file)
index 4ac978e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbred
diff --git a/models/player/nexus.zym_5.skin b/models/player/nexus.zym_5.skin
deleted file mode 100644 (file)
index 4291728..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fborange
diff --git a/models/player/nexus.zym_6.skin b/models/player/nexus.zym_6.skin
deleted file mode 100644 (file)
index 4bc8a44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbcolored
diff --git a/models/player/nexus2.sounds b/models/player/nexus2.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r
diff --git a/models/player/nexus_lod1.zym b/models/player/nexus_lod1.zym
deleted file mode 100644 (file)
index c88108f..0000000
Binary files a/models/player/nexus_lod1.zym and /dev/null differ
diff --git a/models/player/nexus_lod1.zym_0.skin b/models/player/nexus_lod1.zym_0.skin
deleted file mode 100644 (file)
index bccc864..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,nexus
\ No newline at end of file
diff --git a/models/player/nexus_lod1.zym_1.skin b/models/player/nexus_lod1.zym_1.skin
deleted file mode 100644 (file)
index ac518a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,mulder
diff --git a/models/player/nexus_lod1.zym_2.skin b/models/player/nexus_lod1.zym_2.skin
deleted file mode 100644 (file)
index 92d8498..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,xolar
diff --git a/models/player/nexus_lod1.zym_3.skin b/models/player/nexus_lod1.zym_3.skin
deleted file mode 100644 (file)
index b045534..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbgreen
diff --git a/models/player/nexus_lod1.zym_4.skin b/models/player/nexus_lod1.zym_4.skin
deleted file mode 100644 (file)
index 4ac978e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbred
diff --git a/models/player/nexus_lod1.zym_5.skin b/models/player/nexus_lod1.zym_5.skin
deleted file mode 100644 (file)
index 4291728..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fborange
diff --git a/models/player/nexus_lod1.zym_6.skin b/models/player/nexus_lod1.zym_6.skin
deleted file mode 100644 (file)
index 4bc8a44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbcolored
diff --git a/models/player/nexus_lod2.zym b/models/player/nexus_lod2.zym
deleted file mode 100644 (file)
index 7ea9b8e..0000000
Binary files a/models/player/nexus_lod2.zym and /dev/null differ
diff --git a/models/player/nexus_lod2.zym_0.skin b/models/player/nexus_lod2.zym_0.skin
deleted file mode 100644 (file)
index bccc864..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,nexus
\ No newline at end of file
diff --git a/models/player/nexus_lod2.zym_1.skin b/models/player/nexus_lod2.zym_1.skin
deleted file mode 100644 (file)
index ac518a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,mulder
diff --git a/models/player/nexus_lod2.zym_2.skin b/models/player/nexus_lod2.zym_2.skin
deleted file mode 100644 (file)
index 92d8498..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,xolar
diff --git a/models/player/nexus_lod2.zym_3.skin b/models/player/nexus_lod2.zym_3.skin
deleted file mode 100644 (file)
index b045534..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbgreen
diff --git a/models/player/nexus_lod2.zym_4.skin b/models/player/nexus_lod2.zym_4.skin
deleted file mode 100644 (file)
index 4ac978e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbred
diff --git a/models/player/nexus_lod2.zym_5.skin b/models/player/nexus_lod2.zym_5.skin
deleted file mode 100644 (file)
index 4291728..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fborange
diff --git a/models/player/nexus_lod2.zym_6.skin b/models/player/nexus_lod2.zym_6.skin
deleted file mode 100644 (file)
index 4bc8a44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nexus,fbcolored
diff --git a/models/player/pyria.iqm b/models/player/pyria.iqm
new file mode 100644 (file)
index 0000000..f1a0bd4
Binary files /dev/null and b/models/player/pyria.iqm differ
diff --git a/models/player/pyria.iqm.framegroups b/models/player/pyria.iqm.framegroups
new file mode 100644 (file)
index 0000000..dc908e6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 10 15.000000 1 // duck
+81 11 15.000000 1 // duckwalk
+92 16 15.000000 0 // duckjump
+108 15 5.000000 1 // duckidle
+123 16 5.000000 1 // idle
+139 16 15.000000 0 // jump
+155 15 15.000000 0 // painone
+170 17 15.000000 0 // paintwo
+187 3 15.000000 1 // shoot
+190 35 15.000000 1 // taunt
+225 12 20.000000 1 // run
+237 12 20.000000 1 // runbackwards
+249 12 20.000000 1 // strafeleft
+261 12 20.000000 1 // straferight
+273 2 15.000000 0 // deadone
+275 2 15.000000 0 // deadtwo
+277 12 20.000000 1 // forwardright
+289 12 20.000000 1 // forwardleft
+301 12 20.000000 1 // backright
+313 12 20.000000 1 // backleft
diff --git a/models/player/pyria.iqm_0.sounds b/models/player/pyria.iqm_0.sounds
new file mode 100644 (file)
index 0000000..691c58f
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/pyria-skadi/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0
+//coverme sound/player/pyria-skadi/coms/coverme 0
+//defend sound/player/pyria-skadi/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
+freelance sound/player/pyria-skadi/coms/freelance 2
+//getflag sound/player/carni-lycan/player/getflag 0
+//incoming sound/player/pyria-skadi/coms/incoming 0
+meet sound/player/pyria-skadi/coms/meet 0
+needhelp sound/player/pyria-skadi/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/pyria-skadi/coms/seenflag 0
+taunt sound/player/pyria-skadi/coms/taunt 5
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4
+death sound/player/pyria-skadi/player/death 3
+drown sound/player/pyria-skadi/player/drown 0
+//fall sound/player/carni-lycan/player/fall 0
+falling sound/player/pyria-skadi/player/falling 0
+gasp sound/player/pyria-skadi/player/gasp 0
+jump sound/player/pyria-skadi/player/jump 0
+pain25 sound/player/pyria-skadi/player/pain25 0
+pain50 sound/player/pyria-skadi/player/pain50 0
+pain75 sound/player/pyria-skadi/player/pain75 0
+pain100 sound/player/pyria-skadi/player/pain100 0
diff --git a/models/player/pyria.iqm_0.tga b/models/player/pyria.iqm_0.tga
new file mode 100644 (file)
index 0000000..96f53c8
Binary files /dev/null and b/models/player/pyria.iqm_0.tga differ
diff --git a/models/player/pyria.iqm_0.txt b/models/player/pyria.iqm_0.txt
new file mode 100644 (file)
index 0000000..2c52f60
--- /dev/null
@@ -0,0 +1,7 @@
+name Pyria
+species human
+sex Female
+weight 57
+age 53
+
+Necro Warrior
diff --git a/models/player/pyrianew.iqm b/models/player/pyrianew.iqm
deleted file mode 100644 (file)
index ae10df8..0000000
Binary files a/models/player/pyrianew.iqm and /dev/null differ
diff --git a/models/player/pyrianew.iqm.framegroups b/models/player/pyrianew.iqm.framegroups
deleted file mode 100644 (file)
index dc908e6..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 10 15.000000 1 // duck
-81 11 15.000000 1 // duckwalk
-92 16 15.000000 0 // duckjump
-108 15 5.000000 1 // duckidle
-123 16 5.000000 1 // idle
-139 16 15.000000 0 // jump
-155 15 15.000000 0 // painone
-170 17 15.000000 0 // paintwo
-187 3 15.000000 1 // shoot
-190 35 15.000000 1 // taunt
-225 12 20.000000 1 // run
-237 12 20.000000 1 // runbackwards
-249 12 20.000000 1 // strafeleft
-261 12 20.000000 1 // straferight
-273 2 15.000000 0 // deadone
-275 2 15.000000 0 // deadtwo
-277 12 20.000000 1 // forwardright
-289 12 20.000000 1 // forwardleft
-301 12 20.000000 1 // backright
-313 12 20.000000 1 // backleft
diff --git a/models/player/umbra.blend b/models/player/umbra.blend
deleted file mode 100644 (file)
index bcd6a64..0000000
Binary files a/models/player/umbra.blend and /dev/null differ
index 807311d86686bc2872cc9920eff9f25ec2c97118..21f4c80d96a921529e1ba4da4f2e42eff2cb1089 100644 (file)
@@ -5,7 +5,3 @@ weight 61
 age 25
 
 Lightweight Xonotic Solider
-
-Sex: Female
-Weight: 61 kg
-Age: 25
diff --git a/models/player/xolar.dpm b/models/player/xolar.dpm
deleted file mode 100644 (file)
index 5009792..0000000
Binary files a/models/player/xolar.dpm and /dev/null differ
diff --git a/models/player/xolar.dpm.framegroups b/models/player/xolar.dpm.framegroups
deleted file mode 100644 (file)
index d2924b1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Generated framegroups file for xolar
-Used by DarkPlaces to simulate frame groups in DPM models.
-*/
-
-1 41 15 0 // xolar die1
-42 47 30 0 // xolar die2
-89 11 30 1 // xolar draw
-100 11 30 1 // xolar duck
-111 81 60 1 // xolar duckwalk
-192 41 60 0 // xolar duckjump
-233 21 10 1 // xolar duckidle
-254 301 10 1 // xolar idle
-555 41 60 0 // xolar jump
-596 6 15 0 // xolar pain1
-602 6 15 0 // xolar pain2
-608 8 30 1 // xolar shoot
-616 31 30 1 // xolar taunt
-647 41 60 1 // xolar run
-688 41 60 1 // xolar runbackwards
-729 41 60 1 // xolar strafeleft
-770 41 60 1 // xolar straferight
-811 3 30 0 // xolar dead1
-814 3 30 0 // xolar dead2
-817 41 60 1 // xolar forwardright
-858 41 60 1 // xolar forwardleft
-899 41 60 1 // xolar backright
-940 41 60 1 // xolar backleft
diff --git a/models/player/xolar.dpm_0.sounds b/models/player/xolar.dpm_0.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r
diff --git a/models/player/xolar.dpm_0.tga b/models/player/xolar.dpm_0.tga
deleted file mode 100644 (file)
index ed2106a..0000000
Binary files a/models/player/xolar.dpm_0.tga and /dev/null differ
diff --git a/models/player/xolar.dpm_0.txt b/models/player/xolar.dpm_0.txt
deleted file mode 100644 (file)
index e00a563..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-name Xolar
-species robot_solid
-weight 582
-age 439
-
-Heavy Nexuiz's Soldier
diff --git a/models/player/xolar_lod1.dpm b/models/player/xolar_lod1.dpm
deleted file mode 100644 (file)
index 21d0600..0000000
Binary files a/models/player/xolar_lod1.dpm and /dev/null differ
diff --git a/models/player/xolar_lod1.dpm.framegroups b/models/player/xolar_lod1.dpm.framegroups
deleted file mode 100644 (file)
index 70074ef..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Generated framegroups file for xolar_lod1
-Used by DarkPlaces to simulate frame groups in DPM models.
-*/
-
-1 41 15 0 // xolar_lod1 die1
-42 47 30 0 // xolar_lod1 die2
-89 11 30 1 // xolar_lod1 draw
-100 11 30 1 // xolar_lod1 duck
-111 81 60 1 // xolar_lod1 duckwalk
-192 41 60 0 // xolar_lod1 duckjump
-233 21 10 1 // xolar_lod1 duckidle
-254 301 10 1 // xolar_lod1 idle
-555 41 60 0 // xolar_lod1 jump
-596 6 15 0 // xolar_lod1 pain1
-602 6 15 0 // xolar_lod1 pain2
-608 8 30 1 // xolar_lod1 shoot
-616 31 30 1 // xolar_lod1 taunt
-647 41 60 1 // xolar_lod1 run
-688 41 60 1 // xolar_lod1 runbackwards
-729 41 60 1 // xolar_lod1 strafeleft
-770 41 60 1 // xolar_lod1 straferight
-811 3 30 0 // xolar_lod1 dead1
-814 3 30 0 // xolar_lod1 dead2
-817 41 60 1 // xolar_lod1 forwardright
-858 41 60 1 // xolar_lod1 forwardleft
-899 41 60 1 // xolar_lod1 backright
-940 41 60 1 // xolar_lod1 backleft
diff --git a/models/player/xolar_lod2.dpm b/models/player/xolar_lod2.dpm
deleted file mode 100644 (file)
index 821327e..0000000
Binary files a/models/player/xolar_lod2.dpm and /dev/null differ
diff --git a/models/player/xolar_lod2.dpm.animinfo b/models/player/xolar_lod2.dpm.animinfo
deleted file mode 100644 (file)
index 3e2da39..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-Generated animinfo file for xolar_lod2
-Useful for game code to simulate frame groups in DPM models.
-*/
-
-
-// end of animinfo definitions for xolar_lod2
-
-
diff --git a/models/player/xolar_lod2.dpm.framegroups b/models/player/xolar_lod2.dpm.framegroups
deleted file mode 100644 (file)
index 7525506..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Generated framegroups file for xolar_lod2
-Used by DarkPlaces to simulate frame groups in DPM models.
-*/
-
-1 41 15 0 // xolar_lod2 die1
-42 47 30 0 // xolar_lod2 die2
-89 11 30 1 // xolar_lod2 draw
-100 11 30 1 // xolar_lod2 duck
-111 81 60 1 // xolar_lod2 duckwalk
-192 41 60 0 // xolar_lod2 duckjump
-233 21 10 1 // xolar_lod2 duckidle
-254 301 10 1 // xolar_lod2 idle
-555 41 60 0 // xolar_lod2 jump
-596 6 15 0 // xolar_lod2 pain1
-602 6 15 0 // xolar_lod2 pain2
-608 8 30 1 // xolar_lod2 shoot
-616 31 30 1 // xolar_lod2 taunt
-647 41 60 1 // xolar_lod2 run
-688 41 60 1 // xolar_lod2 runbackwards
-729 41 60 1 // xolar_lod2 strafeleft
-770 41 60 1 // xolar_lod2 straferight
-811 3 30 0 // xolar_lod2 dead1
-814 3 30 0 // xolar_lod2 dead2
-817 41 60 1 // xolar_lod2 forwardright
-858 41 60 1 // xolar_lod2 forwardleft
-899 41 60 1 // xolar_lod2 backright
-940 41 60 1 // xolar_lod2 backleft
diff --git a/models/weapons/h_campingrifle.dpm b/models/weapons/h_campingrifle.dpm
deleted file mode 100644 (file)
index 97d227b..0000000
Binary files a/models/weapons/h_campingrifle.dpm and /dev/null differ
diff --git a/models/weapons/h_campingrifle.dpm.framegroups b/models/weapons/h_campingrifle.dpm.framegroups
deleted file mode 100644 (file)
index 474f093..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 39 20 0 // reload
diff --git a/models/weapons/h_campingrifle.iqm b/models/weapons/h_campingrifle.iqm
new file mode 100644 (file)
index 0000000..2d4e970
Binary files /dev/null and b/models/weapons/h_campingrifle.iqm differ
diff --git a/models/weapons/h_campingrifle.iqm.framegroups b/models/weapons/h_campingrifle.iqm.framegroups
new file mode 100644 (file)
index 0000000..474f093
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 39 20 0 // reload
diff --git a/models/weapons/h_crylink.dpm b/models/weapons/h_crylink.dpm
deleted file mode 100644 (file)
index f708fba..0000000
Binary files a/models/weapons/h_crylink.dpm and /dev/null differ
diff --git a/models/weapons/h_crylink.dpm.framegroups b/models/weapons/h_crylink.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm
new file mode 100644 (file)
index 0000000..d05151e
Binary files /dev/null and b/models/weapons/h_crylink.iqm differ
diff --git a/models/weapons/h_crylink.iqm.framegroups b/models/weapons/h_crylink.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_electro.dpm b/models/weapons/h_electro.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_electro.dpm and /dev/null differ
diff --git a/models/weapons/h_electro.dpm.framegroups b/models/weapons/h_electro.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm
new file mode 100644 (file)
index 0000000..ef0c7e2
Binary files /dev/null and b/models/weapons/h_electro.iqm differ
diff --git a/models/weapons/h_electro.iqm.framegroups b/models/weapons/h_electro.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_fireball.dpm b/models/weapons/h_fireball.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_fireball.dpm and /dev/null differ
diff --git a/models/weapons/h_fireball.dpm.framegroups b/models/weapons/h_fireball.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_fireball.iqm b/models/weapons/h_fireball.iqm
new file mode 100644 (file)
index 0000000..4bb062f
Binary files /dev/null and b/models/weapons/h_fireball.iqm differ
diff --git a/models/weapons/h_fireball.iqm.framegroups b/models/weapons/h_fireball.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_gl.dpm b/models/weapons/h_gl.dpm
deleted file mode 100644 (file)
index 6adb433..0000000
Binary files a/models/weapons/h_gl.dpm and /dev/null differ
diff --git a/models/weapons/h_gl.dpm.framegroups b/models/weapons/h_gl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_gl.iqm b/models/weapons/h_gl.iqm
new file mode 100644 (file)
index 0000000..33fab12
Binary files /dev/null and b/models/weapons/h_gl.iqm differ
diff --git a/models/weapons/h_gl.iqm.framegroups b/models/weapons/h_gl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hagar.dpm b/models/weapons/h_hagar.dpm
deleted file mode 100644 (file)
index e588dab..0000000
Binary files a/models/weapons/h_hagar.dpm and /dev/null differ
diff --git a/models/weapons/h_hagar.dpm.framegroups b/models/weapons/h_hagar.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hagar.iqm b/models/weapons/h_hagar.iqm
new file mode 100644 (file)
index 0000000..e3a4d57
Binary files /dev/null and b/models/weapons/h_hagar.iqm differ
diff --git a/models/weapons/h_hagar.iqm.framegroups b/models/weapons/h_hagar.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hagar.iqm.md3 b/models/weapons/h_hagar.iqm.md3
new file mode 100644 (file)
index 0000000..012578b
Binary files /dev/null and b/models/weapons/h_hagar.iqm.md3 differ
diff --git a/models/weapons/h_hlac.dpm b/models/weapons/h_hlac.dpm
deleted file mode 100644 (file)
index 1baded8..0000000
Binary files a/models/weapons/h_hlac.dpm and /dev/null differ
diff --git a/models/weapons/h_hlac.dpm.framegroups b/models/weapons/h_hlac.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hlac.iqm b/models/weapons/h_hlac.iqm
new file mode 100644 (file)
index 0000000..9102145
Binary files /dev/null and b/models/weapons/h_hlac.iqm differ
diff --git a/models/weapons/h_hlac.iqm.framegroups b/models/weapons/h_hlac.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hookgun.dpm b/models/weapons/h_hookgun.dpm
deleted file mode 100644 (file)
index 536febc..0000000
Binary files a/models/weapons/h_hookgun.dpm and /dev/null differ
diff --git a/models/weapons/h_hookgun.dpm.framegroups b/models/weapons/h_hookgun.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hookgun.iqm b/models/weapons/h_hookgun.iqm
new file mode 100644 (file)
index 0000000..0492d0a
Binary files /dev/null and b/models/weapons/h_hookgun.iqm differ
diff --git a/models/weapons/h_hookgun.iqm.framegroups b/models/weapons/h_hookgun.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_laser.dpm b/models/weapons/h_laser.dpm
deleted file mode 100644 (file)
index e5fcb46..0000000
Binary files a/models/weapons/h_laser.dpm and /dev/null differ
diff --git a/models/weapons/h_laser.dpm.framegroups b/models/weapons/h_laser.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
new file mode 100644 (file)
index 0000000..6f9c657
Binary files /dev/null and b/models/weapons/h_laser.iqm differ
diff --git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_minstanex.dpm b/models/weapons/h_minstanex.dpm
deleted file mode 100644 (file)
index dbbc1a0..0000000
Binary files a/models/weapons/h_minstanex.dpm and /dev/null differ
diff --git a/models/weapons/h_minstanex.dpm.framegroups b/models/weapons/h_minstanex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm
new file mode 100644 (file)
index 0000000..66f6bc8
Binary files /dev/null and b/models/weapons/h_minstanex.iqm differ
diff --git a/models/weapons/h_minstanex.iqm.framegroups b/models/weapons/h_minstanex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_nex.dpm b/models/weapons/h_nex.dpm
deleted file mode 100644 (file)
index 76c1293..0000000
Binary files a/models/weapons/h_nex.dpm and /dev/null differ
diff --git a/models/weapons/h_nex.dpm.framegroups b/models/weapons/h_nex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_nex.iqm b/models/weapons/h_nex.iqm
new file mode 100644 (file)
index 0000000..22642ef
Binary files /dev/null and b/models/weapons/h_nex.iqm differ
diff --git a/models/weapons/h_nex.iqm.framegroups b/models/weapons/h_nex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_porto.dpm b/models/weapons/h_porto.dpm
deleted file mode 100644 (file)
index 5040c06..0000000
Binary files a/models/weapons/h_porto.dpm and /dev/null differ
diff --git a/models/weapons/h_porto.dpm.framegroups b/models/weapons/h_porto.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_porto.iqm b/models/weapons/h_porto.iqm
new file mode 100644 (file)
index 0000000..0c6ed41
Binary files /dev/null and b/models/weapons/h_porto.iqm differ
diff --git a/models/weapons/h_porto.iqm.framegroups b/models/weapons/h_porto.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_rl.dpm b/models/weapons/h_rl.dpm
deleted file mode 100644 (file)
index af04093..0000000
Binary files a/models/weapons/h_rl.dpm and /dev/null differ
diff --git a/models/weapons/h_rl.dpm.framegroups b/models/weapons/h_rl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm
new file mode 100644 (file)
index 0000000..6fe1117
Binary files /dev/null and b/models/weapons/h_rl.iqm differ
diff --git a/models/weapons/h_rl.iqm.framegroups b/models/weapons/h_rl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_seeker.dpm b/models/weapons/h_seeker.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_seeker.dpm and /dev/null differ
diff --git a/models/weapons/h_seeker.dpm.framegroups b/models/weapons/h_seeker.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_seeker.iqm b/models/weapons/h_seeker.iqm
new file mode 100644 (file)
index 0000000..4bb062f
Binary files /dev/null and b/models/weapons/h_seeker.iqm differ
diff --git a/models/weapons/h_seeker.iqm.framegroups b/models/weapons/h_seeker.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.dpm b/models/weapons/h_shotgun.dpm
deleted file mode 100644 (file)
index ad489c5..0000000
Binary files a/models/weapons/h_shotgun.dpm and /dev/null differ
diff --git a/models/weapons/h_shotgun.dpm.framegroups b/models/weapons/h_shotgun.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.iqm b/models/weapons/h_shotgun.iqm
new file mode 100644 (file)
index 0000000..1fb76f8
Binary files /dev/null and b/models/weapons/h_shotgun.iqm differ
diff --git a/models/weapons/h_shotgun.iqm.framegroups b/models/weapons/h_shotgun.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_tuba.dpm b/models/weapons/h_tuba.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_tuba.dpm and /dev/null differ
diff --git a/models/weapons/h_tuba.dpm.framegroups b/models/weapons/h_tuba.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_tuba.iqm b/models/weapons/h_tuba.iqm
new file mode 100644 (file)
index 0000000..523bbb1
Binary files /dev/null and b/models/weapons/h_tuba.iqm differ
diff --git a/models/weapons/h_tuba.iqm.framegroups b/models/weapons/h_tuba.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_uzi.dpm b/models/weapons/h_uzi.dpm
deleted file mode 100644 (file)
index 9f7c68a..0000000
Binary files a/models/weapons/h_uzi.dpm and /dev/null differ
diff --git a/models/weapons/h_uzi.dpm.framegroups b/models/weapons/h_uzi.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_uzi.iqm b/models/weapons/h_uzi.iqm
new file mode 100644 (file)
index 0000000..523bbb1
Binary files /dev/null and b/models/weapons/h_uzi.iqm differ
diff --git a/models/weapons/h_uzi.iqm.framegroups b/models/weapons/h_uzi.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
index e9ef2c367e174e9723ed616c06e120b01f851100..251e79f75cf7390d99a516981b7cf14de58fc58b 100644 (file)
Binary files a/models/weapons/v_campingrifle.md3 and b/models/weapons/v_campingrifle.md3 differ
index 80ef5d648606f419237bb9d1c23a8065ab0f40fe..2c9da73fbc57bb3a239a75e96823d2943d48ea3e 100644 (file)
Binary files a/models/weapons/v_crylink.md3 and b/models/weapons/v_crylink.md3 differ
index 2f65d73ac142f48107df570529f257d47735a391..67105bcf6f1686260de4501e9d485f8a1e69b112 100644 (file)
Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ
index 6bb210d2802946c8869c397d9215f2b1b4baeb10..a5e847c37b375d7222611e30f63d6ce38fbfccd3 100644 (file)
Binary files a/models/weapons/v_fireball.md3 and b/models/weapons/v_fireball.md3 differ
index 41ceb9b9cd828c054aa5bbef28b64338950423f3..d705024dd873cc7bd86faacd036f363d5a6559d5 100644 (file)
Binary files a/models/weapons/v_gl.md3 and b/models/weapons/v_gl.md3 differ
index 18664703f9918e69d3167b1938a197ac8d38baf6..19a245343322da6aa2dbfbb7de9b9a96c63264cf 100644 (file)
Binary files a/models/weapons/v_hagar.md3 and b/models/weapons/v_hagar.md3 differ
index 7a26c18106fa5a0a544c8cefffe3acf446f778f3..3bbc34d567d126fcf47fca6b40a6b4b02de58251 100644 (file)
Binary files a/models/weapons/v_hlac.md3 and b/models/weapons/v_hlac.md3 differ
index e4d0304641c21a557ca41ead7bf62ff05915c12b..67df7299f19cb1ed06602d593031aa4b7109cfd1 100644 (file)
Binary files a/models/weapons/v_hookgun.md3 and b/models/weapons/v_hookgun.md3 differ
index 56c78c133cb01e4b9e06830689ca70051d0be5a3..21f84e05e6120c880ac9e60715a6c67527c7816c 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ
index 4d3153e88d625282d50fde681b97de5cfab83c16..d583e1a616ee5e9cf4d0bf3f7e4f8fccf634c7c3 100644 (file)
Binary files a/models/weapons/v_minstanex.md3 and b/models/weapons/v_minstanex.md3 differ
index fef59502712c3fe0fe1f19f440357655f8544633..9144fa0a04f7a199d97d603cd2b8bdd422333a42 100644 (file)
Binary files a/models/weapons/v_nex.md3 and b/models/weapons/v_nex.md3 differ
index 18faccf214a16dd0e1d3948c170b7ce0782a9d64..41beb93b29c0b9b45e8809ac7c58a6105858be1b 100644 (file)
Binary files a/models/weapons/v_porto.md3 and b/models/weapons/v_porto.md3 differ
index c1e995169c8ce6141c1779bd0dcdf35c8f321f13..2506269e838e9936ae1eb3e2062837085b49c5b3 100644 (file)
Binary files a/models/weapons/v_rl.md3 and b/models/weapons/v_rl.md3 differ
index d6555162ef85b6510bec1816e1e7def702241572..146809f9a8d578965e1ddb9c98dca107b1e92848 100644 (file)
Binary files a/models/weapons/v_seeker.md3 and b/models/weapons/v_seeker.md3 differ
index 89a5a435dea1aa5245ecc9835fc314f76c699fdf..d4a6287991b207781085069e89aaaf83d0ac254a 100644 (file)
Binary files a/models/weapons/v_shotgun.md3 and b/models/weapons/v_shotgun.md3 differ
index c076cf0a618df27f7eb5a8789e4f077805f1230a..910b2271ff54a601a553b0bfc840f5087c52b3ca 100644 (file)
Binary files a/models/weapons/v_tuba.md3 and b/models/weapons/v_tuba.md3 differ
index d266814c5183f12acc8f05125174ded90720ec1f..53b27c6b589f4784f103a156e8c4b939308cd2c1 100644 (file)
Binary files a/models/weapons/v_uzi.md3 and b/models/weapons/v_uzi.md3 differ
index 88290d68c4c1feb0676d57b3544704473b9e7dc3..7806e4c24f78f7cba8c8151ad671dfa0a2565f5f 100644 (file)
@@ -12,7 +12,7 @@ sv_jumpvelocity 300
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction -0.125
-sv_airaccel_qw -0.95
+sv_airaccel_qw -0.965
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
index b1e418215c9b86278bc4803615ec7219c720e5b0..c6d03916b7cd4639d4ed86701eb704642facfc6b 100644 (file)
@@ -60,6 +60,10 @@ void CSQC_Init(void)
        
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
        float i;
        CSQC_CheckEngine();
 
index 4aacb27244d5541609769faf0f029c9338cd75a9..1019fdacb3ec706b25c45b5734e7c081bcb85493 100644 (file)
@@ -27,11 +27,11 @@ void setterDummy(entity, float);
 #endif
 
 #ifdef IMPLEMENTATION
-void configureAnimationAnimation(entity me, entity obj, void(entity, float) setter, float startTime, float duration, float startValue, float end)
+void configureAnimationAnimation(entity me, entity obj, void(entity, float) objSetter, float animStartTime, float animDuration, float animStartValue, float animEndValue)
 {
-       me.setObjectSetter(me, obj, setter);
-       me.setTimeStartDuration(me, startTime, duration);
-       me.setValueStartEnd(me, startValue, end);
+       me.setObjectSetter(me, obj, objSetter);
+       me.setTimeStartDuration(me, animStartTime, animDuration);
+       me.setValueStartEnd(me, animStartValue, animEndValue);
 }
 
 void setTimeStartEndAnimation(entity me, float s, float e)
@@ -64,22 +64,22 @@ void setObjectSetterAnimation(entity me, entity o, void(entity, float) s)
        me.setter = s;
 }
 
-void tickAnimation(entity me, float time)
+void tickAnimation(entity me, float tickTime)
 {
-       if (me.isStopped(me) || me.isFinished(me) || (time < me.startTime))
+       if (me.isStopped(me) || me.isFinished(me) || (tickTime < me.startTime))
                return;
 
-       if (time >= (me.startTime + me.duration))
+       if (tickTime >= (me.startTime + me.duration))
                me.finishAnim(me);
        else
-               me.value = me.calcValue(me, (time - me.startTime), me.duration, me.startValue, me.delta);
+               me.value = me.calcValue(me, (tickTime - me.startTime), me.duration, me.startValue, me.delta);
 
        me.setter(me.object, me.value);
 }
 
-float calcValueAnimation(entity me, float time, float duration, float startValue, float delta)
+float calcValueAnimation(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
 {
-       return startValue;
+       return animStartValue;
 }
 
 float isStoppedAnimation(entity me)
@@ -108,7 +108,7 @@ void finishAnimAnimation(entity me)
        me.finished = TRUE;
 }
 
-void setterDummy(entity object, float value)
+void setterDummy(entity obj, float objValue)
 {
 }
 
index 2c82f81e78675df5eabfdf70060b7149e14aa72e..f14a4be0a602625b3d1dae98e3579f5bc553cc1f 100644 (file)
@@ -13,26 +13,26 @@ float easingQuadInOut(float, float, float, float);
 #endif
 
 #ifdef IMPLEMENTATION
-entity makeHostedEasing(entity obj, void(entity, float) setter, float(float, float, float, float) func, float duration, float startValue, float end)
+entity makeHostedEasing(entity obj, void(entity, float) objSetter, float(float, float, float, float) func, float animDuration, float animStartValue, float animEnd)
 {
        entity me;
-       me = makeEasing(obj, setter, func, time, duration, startValue, end);
+       me = makeEasing(obj, objSetter, func, time, animDuration, animStartValue, animEnd);
        anim.addAnim(anim, me);
        return me;
 }
 
-entity makeEasing(entity obj, void(entity, float) setter, float(float, float, float, float) func, float startTime, float duration, float startValue, float end)
+entity makeEasing(entity obj, void(entity, float) objSetter, float(float, float, float, float) func, float animStartTime, float animDuration, float animStartValue, float animEnd)
 {
        entity me;
        me = spawnEasing();
-       me.configureAnimation(me, obj, setter, startTime, duration, startValue, end);
+       me.configureAnimation(me, obj, objSetter, animStartTime, animDuration, animStartValue, animEnd);
        me.setMath(me, func);
        return me;
 }
 
-float calcValueEasing(entity me, float time, float duration, float start, float delta)
+float calcValueEasing(entity me, float tickTime, float animDuration, float animStart, float animDelta)
 {
-       return me.math(time, duration, start, delta);
+       return me.math(tickTime, animDuration, animStart, animDelta);
 }
 
 void setMathEasing(entity me, float(float, float, float, float) func)
@@ -40,32 +40,32 @@ void setMathEasing(entity me, float(float, float, float, float) func)
        me.math = func;
 }
 
-float easingLinear(float time, float duration, float start, float delta)
+float easingLinear(float tickTime, float animDuration, float animStart, float animDelta)
 {
-       return (delta * (time / duration)) + start;
+       return (animDelta * (tickTime / animDuration)) + animStart;
 }
 
-float easingQuadIn(float time, float duration, float start, float delta)
+float easingQuadIn(float tickTime, float animDuration, float animStart, float animDelta)
 {
-       float frac = time / duration;
-       return (delta * frac * frac) + start;
+       float frac = tickTime / animDuration;
+       return (animDelta * frac * frac) + animStart;
 }
 
-float easingQuadOut(float time, float duration, float start, float delta)
+float easingQuadOut(float tickTime, float animDuration, float animStart, float animDelta)
 {
-       float frac = time / duration;
-       return (-delta * frac * (frac - 2)) + start;
+       float frac = tickTime / animDuration;
+       return (-animDelta * frac * (frac - 2)) + animStart;
 }
 
-float easingQuadInOut(float time, float duration, float start, float delta)
+float easingQuadInOut(float tickTime, float animDuration, float animStart, float animDelta)
 {
-       if (time < (duration / 2))
+       if (tickTime < (animDuration / 2))
        {
-               return easingQuadIn(time, (duration / 2), start, (delta / 2));
+               return easingQuadIn(tickTime, (animDuration / 2), animStart, (animDelta / 2));
        }
        else
        {
-               return easingQuadOut((time - (duration / 2)), (duration / 2), (start + (delta / 2)), (delta / 2));
+               return easingQuadOut((tickTime - (animDuration / 2)), (animDuration / 2), (animStart + (animDelta / 2)), (animDelta / 2));
        }
 }
 
index d32f19618454dd655c9cc87b51bab9303e3c0cb3..95fbf63ccefe5b15d5acc6a019db25a868d2fedf 100644 (file)
@@ -15,26 +15,26 @@ float getNewChildValue(entity);
 #endif
 
 #ifdef IMPLEMENTATION
-entity makeHostedKeyframe(entity obj, void(entity, float) setter, float duration, float start, float end)
+entity makeHostedKeyframe(entity obj, void(entity, float) objSetter, float animDuration, float animStart, float animEnd)
 {
        entity me;
-       me = makeKeyframe(obj, setter, duration, start, end);
+       me = makeKeyframe(obj, objSetter, animDuration, animStart, animEnd);
        anim.addAnim(anim, me);
        return me;
 }
 
-entity makeKeyframe(entity obj, void(entity, float) setter, float duration, float start, float end)
+entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuration, float animStart, float animEnd)
 {
        entity me;
        me = spawnKeyframe();
-       me.configureAnimation(me, obj, setter, time, duration, start, end);
+       me.configureAnimation(me, obj, objSetter, time, animDuration, animStart, animEnd);
        return me;
 }
 
-entity addEasingKeyframe(entity me, float durationTime, float end, float(float, float, float, float) func)
+entity addEasingKeyframe(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func)
 {
        entity other;
-       other = makeEasing(me.object, me.setter, func, getNewChildStart(me), getNewChildDuration(me, durationTime), getNewChildValue(me), end);
+       other = makeEasing(me.object, me.setter, func, getNewChildStart(me), getNewChildDuration(me, animDurationTime), getNewChildValue(me), animEnd);
        me.addAnim(me, other);
        return other;
 }
@@ -92,7 +92,7 @@ void addAnimKeyframe(entity me, entity other)
        me.lastChild = other;
 }
 
-float calcValueKeyframe(entity me, float time, float duration, float startValue, float delta)
+float calcValueKeyframe(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
 {
        if (me.currentChild)
                if (me.currentChild.isFinished(me.currentChild))
@@ -100,10 +100,10 @@ float calcValueKeyframe(entity me, float time, float duration, float startValue,
 
        if (me.currentChild)
        {
-               me.currentChild.tick(me.currentChild, time);
+               me.currentChild.tick(me.currentChild, tickTime);
                return me.currentChild.value;
        }
 
-       return startValue + delta;
+       return animStartValue + animDelta;
 }
 #endif
index a0493482081d3d03e4775fa9a2a988bd2499a979..d85b1d5285084566dae9598a08565312cd45bfd0 100644 (file)
@@ -106,9 +106,9 @@ float mouseDragListBox(entity me, vector pos)
                if(hit)
                {
                        // calculate new pos to v
-                       float delta;
-                       delta = (pos_y - me.pressOffset) / (1 - (me.controlBottom - me.controlTop)) * (me.nItems * me.itemHeight - 1);
-                       me.scrollPos = me.previousValue + delta;
+                       float d;
+                       d = (pos_y - me.pressOffset) / (1 - (me.controlBottom - me.controlTop)) * (me.nItems * me.itemHeight - 1);
+                       me.scrollPos = me.previousValue + d;
                }
                else
                        me.scrollPos = me.previousValue;
index 462337c05126cab5acbfe786cc1b0c23034df70c..b8fee02a13263a8b9e24a7b43359c150bc1f9dad 100644 (file)
@@ -24,6 +24,10 @@ void() m_init =
 
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4MQC Build information: ", WATERMARK(), "\n");
+#endif
+
        // list all game dirs (TEST)
        if(cvar("developer"))
        {
index 1184d2967f3537b8a6dde74fe4fcc1bac1422a50..eb080a50f5f8ada5697f4dbc8ba9a326dbeb05ba 100644 (file)
@@ -92,7 +92,7 @@ void fillXonoticEffectsSettingsTab(entity me)
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Particle quality:"));
-               me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1.0, 0.05, "cl_particles_quality"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Particle dist.:"));
                me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
index 4f365d794f5829342a3fa933425bf99d2156b05e..3571e1ba834c6b47c5c9cb7392f9e071ee9289ec 100644 (file)
@@ -322,8 +322,18 @@ float preMenuInit()
 
 string campaign_name_previous;
 float campaign_won_previous;
+#ifdef WATERMARK
+var string autocvar_menu_watermark = WATERMARK();
+#else
+var string autocvar_menu_watermark = "";
+#endif
 void postMenuDraw()
 {
+       if(autocvar_menu_watermark != "")
+       {
+               vector fs = '48 48 0';
+               draw_CenterText('0.5 0.1 0', autocvar_menu_watermark, globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
+       }
 }
 void preMenuDraw()
 {
index 2401c746f2acf135455dffa6d439b50b5bfebbdd..b4285304570c574c1ba0a8160e3da29ef12f1930 100644 (file)
@@ -153,7 +153,7 @@ void bot_setnameandstuff()
        else bot_name = "Bot";
 
        if(argv(1) != "") bot_model = argv(1);
-       else bot_model = "marine";
+       else bot_model = "";
 
        if(argv(2) != "") bot_skin = argv(2);
        else bot_skin = "0";
@@ -202,7 +202,7 @@ void bot_setnameandstuff()
 
        // pick the model and skin
        if(substring(bot_model, -4, 1) != ".")
-               bot_model = strcat(bot_model, ".zym");
+               bot_model = strcat(bot_model, ".iqm");
        self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model));
        self.playerskin = self.playerskin_freeme = strzone(bot_skin);
 
index 90f4b234eb8fc07173ef73884a906088803477eb..45eab621ea6b83caf327e662ceff0648dc2d09fe 100644 (file)
@@ -230,11 +230,8 @@ float CheatImpulse(float i)
                        IS_CHEAT(i, 0, 0);
                        FOR_EACH_PLAYER(e)
                        {
-                               if( e.playermodel == "models/player/jeandarc.zym"
-                                               ||  e.playermodel == "models/player/pyria.zym"
-                                               ||  e.playermodel == "models/player/skadi.zym"
-                                               || (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
-                                               ||  e.playermodel == "models/player/visitant.zym")
+                               get_model_parameters(e.playermodel, e.skinindex);
+                               if(get_model_parameters_sex == "Female")
                                {
                                        makevectors(e.angles);
                                        traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);
index c5acd3ebf8151dbdc349b9f5a62ea0033960d05f..e9d9900ac28b5041326d7406f5e3cf4dba61e129 100644 (file)
@@ -398,8 +398,15 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.
 =============
 */
-string FallbackPlayerModel = "models/player/marine.zym";
+string FallbackPlayerModel;
 string CheckPlayerModel(string plyermodel) {
+       if(FallbackPlayerModel != cvar_defstring("_cl_playermodel"))
+       {
+               // note: we cannot summon Don Strunzone here, some player may
+               // still have the model string set. In case anyone manages how
+               // to change a cvar default, we'll have a small leak here.
+               FallbackPlayerModel = strzone(cvar_defstring("_cl_playermodel"));
+       }
        if(strlen(plyermodel) < 4)
                return FallbackPlayerModel;
        if( substring(plyermodel,0,14) != "models/player/")
@@ -1386,6 +1393,10 @@ void ClientConnect (void)
 
        DecodeLevelParms();
 
+#ifdef WATERMARK
+       sprint(self, strcat("^4SVQC Build information: ", WATERMARK(), "\n"));
+#endif
+
        self.classname = "player_joining";
 
        self.flags = FL_CLIENT;
index f1e9bf70e9b03334190d1b8eba91ba6685924ba2..e17c346d283373e2c96de40c34ab709685806872 100644 (file)
@@ -440,8 +440,8 @@ void CL_Weaponentity_Think()
                        }
                        else
                        {
-                               setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".dpm")); // precision set below
-                               animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".dpm.animinfo");
+                               setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".iqm")); // precision set below
+                               animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".iqm.animinfo");
                                animfile = fopen(animfilename, FILE_READ);
                                // preset some defaults that work great for renamed zym files (which don't need an animinfo)
                                self.anim_fire1  = '0 1 0.01';
index bcd1ea7d08c4bbc7d0549afff9e7692aa321c185..22f5458309f520be8948c73b868da2fe362c7c57 100644 (file)
@@ -1583,6 +1583,7 @@ void precache()
         precache_all_playermodels("models/player/*.dpm");
         precache_all_playermodels("models/player/*.md3");
         precache_all_playermodels("models/player/*.psk");
+        precache_all_playermodels("models/player/*.iqm");
     }
 
     if (cvar("sv_defaultcharacter"))
@@ -2325,7 +2326,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
                        {
                                // center
                                vecs_y = 0;
-                               vecs_z -= 4;
+                               vecs_z -= 2;
                        }
                        else
                        {
@@ -2338,7 +2339,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
                        {
                                // center
                                vecs_y = 0;
-                               vecs_z -= 4;
+                               vecs_z -= 2;
                        }
                        else
                        {
@@ -2376,7 +2377,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
                else
                {
                        vecs_y = 0;
-                       vecs_z -= 4;
+                       vecs_z -= 2;
                }
        }
        else if ((s = cvar_string("g_shootfromfixedorigin")) != "")
index e8313769631a7c6b57a653dee4527f1f4b39f099..f0ac7307bededa0d525fa31b0ff19ececbbe21fd 100644 (file)
@@ -176,7 +176,7 @@ float w_campingrifle(float req)
        {               
                precache_model ("models/weapons/g_campingrifle.md3");
                precache_model ("models/weapons/v_campingrifle.md3");
-               precache_model ("models/weapons/h_campingrifle.dpm");
+               precache_model ("models/weapons/h_campingrifle.iqm");
                precache_sound ("weapons/campingrifle_reload.wav");
                precache_sound ("weapons/campingrifle_fire.wav");
                precache_sound ("weapons/campingrifle_fire2.wav");
index ba676866dce26e8caa1af772dc9eb41b3b471c75..b95a7cef897645479054eba22b5e7d79e269a2c8 100644 (file)
@@ -209,7 +209,7 @@ float w_crylink(float req)
        {
                precache_model ("models/weapons/g_crylink.md3");
                precache_model ("models/weapons/v_crylink.md3");
-               precache_model ("models/weapons/h_crylink.dpm");
+               precache_model ("models/weapons/h_crylink.iqm");
                precache_sound ("weapons/crylink_fire.wav");
                precache_sound ("weapons/crylink_fire2.wav");
        }
index e19c01b343f88f597cb634959db2f0a4545c069c..c1cb49d0ebb896c4b50f3985e95bb7eeb704a38a 100644 (file)
@@ -270,7 +270,7 @@ float w_electro(float req)
        {
                precache_model ("models/weapons/g_electro.md3");
                precache_model ("models/weapons/v_electro.md3");
-               precache_model ("models/weapons/h_electro.dpm");
+               precache_model ("models/weapons/h_electro.iqm");
                precache_sound ("weapons/electro_bounce.wav");
                precache_sound ("weapons/electro_fire.wav");
                precache_sound ("weapons/electro_fire2.wav");
index 6bccb7e3f6dbfd2f7c455456197ea6586d0c2073..c1d30ba0211f53bbd9297b4bcf2a96797a8a5851 100644 (file)
@@ -337,7 +337,7 @@ float w_fireball(float req)
        {
                precache_model ("models/weapons/g_fireball.md3");
                precache_model ("models/weapons/v_fireball.md3");
-               precache_model ("models/weapons/h_fireball.dpm");
+               precache_model ("models/weapons/h_fireball.iqm");
                precache_model ("models/sphere/sphere.md3");
                precache_sound ("weapons/fireball_fire.wav");
                precache_sound ("weapons/fireball_fire2.wav");
index 559ced33d8193be473e668cb6445cb70ecfd8866..380e849fe35c276d259d84e7d76b1c398edb6d09 100644 (file)
@@ -201,7 +201,7 @@ float w_glauncher(float req)
        {
                precache_model ("models/weapons/g_gl.md3");
                precache_model ("models/weapons/v_gl.md3");
-               precache_model ("models/weapons/h_gl.dpm");
+               precache_model ("models/weapons/h_gl.iqm");
                precache_sound ("weapons/grenade_bounce1.wav");
                precache_sound ("weapons/grenade_bounce2.wav");
                precache_sound ("weapons/grenade_bounce3.wav");
index f23893ac18c5719f037dbb97acc7283f7532b423..06ff58857860d4fd5d35910ede418287cb55fd0f 100644 (file)
@@ -141,7 +141,7 @@ float w_hagar(float req)
        {
                precache_model ("models/weapons/g_hagar.md3");
                precache_model ("models/weapons/v_hagar.md3");
-               precache_model ("models/weapons/h_hagar.dpm");
+               precache_model ("models/weapons/h_hagar.iqm");
                precache_sound ("weapons/hagar_fire.wav");
        }
        else if (req == WR_SETUP)
index f182ed3971d795c16b86822eee9e69f5d6683779..ecd30d76911d0b8f016eada99910014eb7cf9d31 100644 (file)
@@ -196,7 +196,7 @@ float w_hlac(float req)
        {
         precache_model ("models/weapons/g_hlac.md3");
                precache_model ("models/weapons/v_hlac.md3");
-               precache_model ("models/weapons/h_hlac.dpm");
+               precache_model ("models/weapons/h_hlac.iqm");
                precache_sound ("weapons/lasergun_fire.wav");
 
        }
index 79240494febd784750c5b494a07da924e6ac06d0..6b2270af2f26726a3120dbc6ad802a66d0ffbb81 100644 (file)
@@ -217,7 +217,7 @@ float w_hook(float req)
        {
                precache_model ("models/weapons/g_hookgun.md3");
                precache_model ("models/weapons/v_hookgun.md3");
-               precache_model ("models/weapons/h_hookgun.dpm");
+               precache_model ("models/weapons/h_hookgun.iqm");
                precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
                precache_sound ("weapons/hook_fire.wav");
                precache_sound ("weapons/hookbomb_fire.wav");
index d90c97a38959f04a7b72708e25484e64d13c83a2..4d749d0ba1c36bdcdc792883cee07b0d1652cc0e 100644 (file)
@@ -167,7 +167,7 @@ float w_laser(float req)
        {
                precache_model ("models/weapons/g_laser.md3");
                precache_model ("models/weapons/v_laser.md3");
-               precache_model ("models/weapons/h_laser.dpm");
+               precache_model ("models/weapons/h_laser.iqm");
                precache_sound ("weapons/lasergun_fire.wav");
                precache_sound ("weapons/gauntlet_fire.wav");
        }
index 27bc8bd91dae9d0e38b51f73fa1298602a17699d..00e8fd890a0ea2f2a7bf22ac9328fc52daf9ac3c 100644 (file)
@@ -210,7 +210,7 @@ float w_minstanex(float req)
                precache_model ("models/nexflash.md3");
                precache_model ("models/weapons/g_minstanex.md3");
                precache_model ("models/weapons/v_minstanex.md3");
-               precache_model ("models/weapons/h_minstanex.dpm");
+               precache_model ("models/weapons/h_minstanex.iqm");
                precache_sound ("weapons/minstanexfire.wav");
                precache_sound ("weapons/nexwhoosh1.wav");
                precache_sound ("weapons/nexwhoosh2.wav");
index f9196a8e8c979a0fb1eaa12d38b4fc1d90c97a89..7a9103ccfabf2cd619919b4863fbfcdc9a1ccaa9 100644 (file)
@@ -61,7 +61,7 @@ float w_nex(float req)
                precache_model ("models/nexflash.md3");
                precache_model ("models/weapons/g_nex.md3");
                precache_model ("models/weapons/v_nex.md3");
-               precache_model ("models/weapons/h_nex.dpm");
+               precache_model ("models/weapons/h_nex.iqm");
                precache_sound ("weapons/nexfire.wav");
                precache_sound ("weapons/nexwhoosh1.wav");
                precache_sound ("weapons/nexwhoosh2.wav");
index 55872df4fcfd89ee4a73821baca67ace1c154add..55bbc51f8c4bc44624187cabe4fcdba3ddc74cce 100644 (file)
@@ -257,7 +257,7 @@ float w_porto(float req)
        {
                precache_model ("models/weapons/g_porto.md3");
                precache_model ("models/weapons/v_porto.md3");
-               precache_model ("models/weapons/h_porto.dpm");
+               precache_model ("models/weapons/h_porto.iqm");
                precache_model ("models/portal.md3");
                precache_sound ("porto/bounce.wav");
                precache_sound ("porto/create.wav");
index 68cd5e9597152a4bd33dc64ee037dd7692035711..348a79c700630c8cd78663c1014ea95394e897a0 100644 (file)
@@ -520,7 +520,7 @@ float w_rlauncher(float req)
                precache_model ("models/flash.md3");
                precache_model ("models/weapons/g_rl.md3");
                precache_model ("models/weapons/v_rl.md3");
-               precache_model ("models/weapons/h_rl.dpm");
+               precache_model ("models/weapons/h_rl.iqm");
                precache_sound ("weapons/rocket_det.wav");
                precache_sound ("weapons/rocket_fire.wav");
                precache_sound ("weapons/rocket_mode.wav");
index 5307a3c68936e0b4d10df0668d222cd4c9a0514c..691a25251aebc1e3377414f057735158124d9d45 100644 (file)
@@ -453,7 +453,7 @@ float w_seeker(float req)
        {
                precache_model ("models/weapons/g_seeker.md3");
                precache_model ("models/weapons/v_seeker.md3");
-               precache_model ("models/weapons/h_seeker.dpm");
+               precache_model ("models/weapons/h_seeker.iqm");
                precache_sound ("weapons/tag_fire.wav");
                precache_sound ("weapons/flac_fire.wav");
                precache_sound ("weapons/seeker_fire.wav");
index 71451aa09c1a3e422f2f8b04ae46628ff33ac8a4..0b499f4832586cc8b5c03e6688d00c519a7adcd6 100644 (file)
@@ -129,7 +129,7 @@ float w_shotgun(float req)
                precache_model ("models/uziflash.md3");
                precache_model ("models/weapons/g_shotgun.md3");
                precache_model ("models/weapons/v_shotgun.md3");
-               precache_model ("models/weapons/h_shotgun.dpm");
+               precache_model ("models/weapons/h_shotgun.iqm");
                precache_sound ("misc/itempickup.wav");
                precache_sound ("weapons/shotgun_fire.wav");
        }
index 9074ba84926ad12e4d85729cf2b55a1cc14c9318..eab14f4f516d62da409e3c2ada398c8afb81b9ce 100644 (file)
@@ -228,7 +228,7 @@ float w_tuba(float req)
        {
                precache_model ("models/weapons/g_tuba.md3");
                precache_model ("models/weapons/v_tuba.md3");
-               precache_model ("models/weapons/h_tuba.dpm");
+               precache_model ("models/weapons/h_tuba.iqm");
 
                //float i;
                //for(i = -18; i <= +27; ++i)
index ddec0e8abf0e7c7bf7ed5d7c6f164c7bf45e7252..4887f803d36e518153bf69de39a14378f1b6c982 100644 (file)
@@ -116,7 +116,7 @@ float w_uzi(float req)
                precache_model ("models/uziflash.md3");
                precache_model ("models/weapons/g_uzi.md3");
                precache_model ("models/weapons/v_uzi.md3");
-               precache_model ("models/weapons/h_uzi.dpm");
+               precache_model ("models/weapons/h_uzi.iqm");
                precache_sound ("weapons/uzi_fire.wav");
        }
        else if (req == WR_SETUP)
diff --git a/scripts/model-common.shader b/scripts/model-common.shader
new file mode 100644 (file)
index 0000000..a99d5ee
--- /dev/null
@@ -0,0 +1,10 @@
+// shaders to be used on models
+
+nodraw
+{
+       surfaceparm nodraw
+       surfaceparm nolightmap
+       surfaceparm nonsolid
+       surfaceparm trans
+       surfaceparm nomarks
+}
diff --git a/scripts/pyria.shader b/scripts/pyria.shader
new file mode 100644 (file)
index 0000000..8cc0385
--- /dev/null
@@ -0,0 +1,13 @@
+pyriahair
+{
+
+       surfaceparm trans
+       cull none
+
+       {
+               map textures/pyriahair
+               alphaFunc GE128
+               blendFunc blend
+               rgbGen identity
+       }
+}
diff --git a/scripts/pyrianew.shader b/scripts/pyrianew.shader
deleted file mode 100644 (file)
index abc3bcf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-pyrianewhair
-{
-
-       surfaceparm trans
-       cull none
-
-       {
-               map textures/pyrianewhair
-               alphaFunc GE128
-               blendFunc blend
-               rgbGen identity
-       }
-}
diff --git a/scripts/turrets.shader b/scripts/turrets.shader
new file mode 100644 (file)
index 0000000..c0d223c
--- /dev/null
@@ -0,0 +1,57 @@
+models/turrets/tesla_chrome\r
+{\r
+\r
+       qer_editorimage models/turrets/chrome.tga\r
+\r
+       //dp_reflect 0 0.75 0.75 1 0.5  \r
+       {\r
+               map models/turrets/chrome.tga   \r
+               rgbGen vertex\r
+               tcGen environment \r
+               tcMod scale 2 2\r
+               \r
+       }\r
+}\r
+\r
+models/turrets/phaser_beam\r
+{\r
+       surfaceparm trans\r
+       cull none\r
+       nopicmip\r
+\r
+       qer_editorimage models/turrets/phaser_beam\r
+       {               \r
+               map models/turrets/phaser_beam\r
+               blendFunc add\r
+       }\r
+\r
+}\r
+\r
+models/turrets/reactor_beams\r
+{\r
+       surfaceparm trans\r
+       cull none\r
+\r
+       qer_editorimage models/turrets/reactor\r
+       {               \r
+               map models/turrets/reactor\r
+               blendFunc add\r
+       }\r
+}\r
+\r
+models/turrets/r_fx1\r
+{\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm pointlight\r
+       surfaceparm nolightmap  \r
+       nopicmip\r
+       qer_editorimage models/turrets/r_fx1_1\r
+\r
+       {\r
+               animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 \r
+       }\r
+\r
+}\r
+\r
+\r
diff --git a/textures/fbcolored.tga b/textures/fbcolored.tga
deleted file mode 100644 (file)
index 96f0a68..0000000
Binary files a/textures/fbcolored.tga and /dev/null differ
diff --git a/textures/fbcolored_bump.tga b/textures/fbcolored_bump.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbcolored_bump.tga and /dev/null differ
diff --git a/textures/fbcolored_gloss.tga b/textures/fbcolored_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbcolored_gloss.tga and /dev/null differ
diff --git a/textures/fbcolored_shirt.tga b/textures/fbcolored_shirt.tga
deleted file mode 100644 (file)
index 082342e..0000000
Binary files a/textures/fbcolored_shirt.tga and /dev/null differ
diff --git a/textures/fbgreen.tga b/textures/fbgreen.tga
deleted file mode 100644 (file)
index 96f0a68..0000000
Binary files a/textures/fbgreen.tga and /dev/null differ
diff --git a/textures/fbgreen_bump.tga b/textures/fbgreen_bump.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbgreen_bump.tga and /dev/null differ
diff --git a/textures/fbgreen_gloss.tga b/textures/fbgreen_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbgreen_gloss.tga and /dev/null differ
diff --git a/textures/fbgreen_glow.tga b/textures/fbgreen_glow.tga
deleted file mode 100644 (file)
index 519ed3d..0000000
Binary files a/textures/fbgreen_glow.tga and /dev/null differ
diff --git a/textures/fbgreen_pants.tga b/textures/fbgreen_pants.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fbgreen_pants.tga and /dev/null differ
diff --git a/textures/fbgreen_shirt.tga b/textures/fbgreen_shirt.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fbgreen_shirt.tga and /dev/null differ
diff --git a/textures/fborange.tga b/textures/fborange.tga
deleted file mode 100644 (file)
index 96f0a68..0000000
Binary files a/textures/fborange.tga and /dev/null differ
diff --git a/textures/fborange_bump.tga b/textures/fborange_bump.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fborange_bump.tga and /dev/null differ
diff --git a/textures/fborange_gloss.tga b/textures/fborange_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fborange_gloss.tga and /dev/null differ
diff --git a/textures/fborange_glow.tga b/textures/fborange_glow.tga
deleted file mode 100644 (file)
index ea5d259..0000000
Binary files a/textures/fborange_glow.tga and /dev/null differ
diff --git a/textures/fborange_pants.tga b/textures/fborange_pants.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fborange_pants.tga and /dev/null differ
diff --git a/textures/fborange_shirt.tga b/textures/fborange_shirt.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fborange_shirt.tga and /dev/null differ
diff --git a/textures/fbred.tga b/textures/fbred.tga
deleted file mode 100644 (file)
index 96f0a68..0000000
Binary files a/textures/fbred.tga and /dev/null differ
diff --git a/textures/fbred_bump.tga b/textures/fbred_bump.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbred_bump.tga and /dev/null differ
diff --git a/textures/fbred_gloss.tga b/textures/fbred_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/fbred_gloss.tga and /dev/null differ
diff --git a/textures/fbred_glow.tga b/textures/fbred_glow.tga
deleted file mode 100644 (file)
index 759b21e..0000000
Binary files a/textures/fbred_glow.tga and /dev/null differ
diff --git a/textures/fbred_pants.tga b/textures/fbred_pants.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fbred_pants.tga and /dev/null differ
diff --git a/textures/fbred_shirt.tga b/textures/fbred_shirt.tga
deleted file mode 100644 (file)
index d1319c7..0000000
Binary files a/textures/fbred_shirt.tga and /dev/null differ
diff --git a/textures/items/a_bullets.jpg b/textures/items/a_bullets.jpg
new file mode 100644 (file)
index 0000000..8a99c05
Binary files /dev/null and b/textures/items/a_bullets.jpg differ
diff --git a/textures/items/a_rocket_box.jpg b/textures/items/a_rocket_box.jpg
new file mode 100644 (file)
index 0000000..a29505b
Binary files /dev/null and b/textures/items/a_rocket_box.jpg differ
diff --git a/textures/items/a_rocket_gre.jpg b/textures/items/a_rocket_gre.jpg
new file mode 100644 (file)
index 0000000..66fbc3c
Binary files /dev/null and b/textures/items/a_rocket_gre.jpg differ
diff --git a/textures/items/a_rocket_gre_glow.jpg b/textures/items/a_rocket_gre_glow.jpg
new file mode 100644 (file)
index 0000000..b26e87d
Binary files /dev/null and b/textures/items/a_rocket_gre_glow.jpg differ
diff --git a/textures/items/a_rocket_roc.jpg b/textures/items/a_rocket_roc.jpg
new file mode 100644 (file)
index 0000000..300b2b9
Binary files /dev/null and b/textures/items/a_rocket_roc.jpg differ
diff --git a/textures/items/a_rocket_roc_gloss.jpg b/textures/items/a_rocket_roc_gloss.jpg
new file mode 100644 (file)
index 0000000..0e6f937
Binary files /dev/null and b/textures/items/a_rocket_roc_gloss.jpg differ
diff --git a/textures/items/a_rocket_roc_glow.jpg b/textures/items/a_rocket_roc_glow.jpg
new file mode 100644 (file)
index 0000000..2bb921a
Binary files /dev/null and b/textures/items/a_rocket_roc_glow.jpg differ
diff --git a/textures/items/a_rocket_roc_norm.jpg b/textures/items/a_rocket_roc_norm.jpg
new file mode 100644 (file)
index 0000000..8073764
Binary files /dev/null and b/textures/items/a_rocket_roc_norm.jpg differ
diff --git a/textures/items/a_rocket_tag.jpg b/textures/items/a_rocket_tag.jpg
new file mode 100644 (file)
index 0000000..1314605
Binary files /dev/null and b/textures/items/a_rocket_tag.jpg differ
diff --git a/textures/lurk.tga b/textures/lurk.tga
deleted file mode 100644 (file)
index 1384187..0000000
Binary files a/textures/lurk.tga and /dev/null differ
diff --git a/textures/lurk_bump.tga b/textures/lurk_bump.tga
deleted file mode 100644 (file)
index 7553e40..0000000
Binary files a/textures/lurk_bump.tga and /dev/null differ
diff --git a/textures/lurk_gloss.tga b/textures/lurk_gloss.tga
deleted file mode 100644 (file)
index 9647cde..0000000
Binary files a/textures/lurk_gloss.tga and /dev/null differ
diff --git a/textures/lurk_glow.tga b/textures/lurk_glow.tga
deleted file mode 100644 (file)
index 15b3071..0000000
Binary files a/textures/lurk_glow.tga and /dev/null differ
diff --git a/textures/lurk_pants.tga b/textures/lurk_pants.tga
deleted file mode 100644 (file)
index 75ae525..0000000
Binary files a/textures/lurk_pants.tga and /dev/null differ
diff --git a/textures/lurk_shirt.tga b/textures/lurk_shirt.tga
deleted file mode 100644 (file)
index 7d21659..0000000
Binary files a/textures/lurk_shirt.tga and /dev/null differ
diff --git a/textures/marine.tga b/textures/marine.tga
deleted file mode 100644 (file)
index 752c40f..0000000
Binary files a/textures/marine.tga and /dev/null differ
diff --git a/textures/marine_gloss.tga b/textures/marine_gloss.tga
deleted file mode 100644 (file)
index deb4151..0000000
Binary files a/textures/marine_gloss.tga and /dev/null differ
diff --git a/textures/marine_glow.tga b/textures/marine_glow.tga
deleted file mode 100644 (file)
index 9af5a19..0000000
Binary files a/textures/marine_glow.tga and /dev/null differ
diff --git a/textures/marine_norm.tga b/textures/marine_norm.tga
deleted file mode 100644 (file)
index 850ce49..0000000
Binary files a/textures/marine_norm.tga and /dev/null differ
diff --git a/textures/marine_pants.tga b/textures/marine_pants.tga
deleted file mode 100644 (file)
index 1f295b8..0000000
Binary files a/textures/marine_pants.tga and /dev/null differ
diff --git a/textures/marine_shirt.tga b/textures/marine_shirt.tga
deleted file mode 100644 (file)
index a31f3d0..0000000
Binary files a/textures/marine_shirt.tga and /dev/null differ
diff --git a/textures/mulder.tga b/textures/mulder.tga
deleted file mode 100644 (file)
index 96f0a68..0000000
Binary files a/textures/mulder.tga and /dev/null differ
diff --git a/textures/mulder_bump.tga b/textures/mulder_bump.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/mulder_bump.tga and /dev/null differ
diff --git a/textures/mulder_gloss.tga b/textures/mulder_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/mulder_gloss.tga and /dev/null differ
diff --git a/textures/mulder_glow.tga b/textures/mulder_glow.tga
deleted file mode 100644 (file)
index fadce66..0000000
Binary files a/textures/mulder_glow.tga and /dev/null differ
diff --git a/textures/mulder_pants.tga b/textures/mulder_pants.tga
deleted file mode 100644 (file)
index d0f776a..0000000
Binary files a/textures/mulder_pants.tga and /dev/null differ
diff --git a/textures/mulder_shirt.tga b/textures/mulder_shirt.tga
deleted file mode 100644 (file)
index 91d673a..0000000
Binary files a/textures/mulder_shirt.tga and /dev/null differ
diff --git a/textures/nexus.tga b/textures/nexus.tga
deleted file mode 100644 (file)
index 13e88b9..0000000
Binary files a/textures/nexus.tga and /dev/null differ
diff --git a/textures/nexus_gloss.tga b/textures/nexus_gloss.tga
deleted file mode 100644 (file)
index 08509c3..0000000
Binary files a/textures/nexus_gloss.tga and /dev/null differ
diff --git a/textures/nexus_glow.tga b/textures/nexus_glow.tga
deleted file mode 100644 (file)
index d43c8b1..0000000
Binary files a/textures/nexus_glow.tga and /dev/null differ
diff --git a/textures/nexus_pants.tga b/textures/nexus_pants.tga
deleted file mode 100644 (file)
index 5d0bd63..0000000
Binary files a/textures/nexus_pants.tga and /dev/null differ
diff --git a/textures/nexus_shirt.tga b/textures/nexus_shirt.tga
deleted file mode 100644 (file)
index 66c0377..0000000
Binary files a/textures/nexus_shirt.tga and /dev/null differ
diff --git a/textures/pyria.tga b/textures/pyria.tga
new file mode 100644 (file)
index 0000000..b659f62
Binary files /dev/null and b/textures/pyria.tga differ
diff --git a/textures/pyria_gloss.jpg b/textures/pyria_gloss.jpg
new file mode 100644 (file)
index 0000000..8cd77a7
Binary files /dev/null and b/textures/pyria_gloss.jpg differ
diff --git a/textures/pyria_glow.jpg b/textures/pyria_glow.jpg
new file mode 100644 (file)
index 0000000..952dfd9
Binary files /dev/null and b/textures/pyria_glow.jpg differ
diff --git a/textures/pyria_glow.tga b/textures/pyria_glow.tga
new file mode 100644 (file)
index 0000000..b1161db
Binary files /dev/null and b/textures/pyria_glow.tga differ
diff --git a/textures/pyria_norm.tga b/textures/pyria_norm.tga
new file mode 100644 (file)
index 0000000..4301faa
Binary files /dev/null and b/textures/pyria_norm.tga differ
diff --git a/textures/pyria_pants.tga b/textures/pyria_pants.tga
new file mode 100644 (file)
index 0000000..0b6a69c
Binary files /dev/null and b/textures/pyria_pants.tga differ
diff --git a/textures/pyria_shirt.tga b/textures/pyria_shirt.tga
new file mode 100644 (file)
index 0000000..ff448ab
Binary files /dev/null and b/textures/pyria_shirt.tga differ
diff --git a/textures/pyriahair.jpg b/textures/pyriahair.jpg
new file mode 100644 (file)
index 0000000..cc300fb
Binary files /dev/null and b/textures/pyriahair.jpg differ
diff --git a/textures/pyriahair_alpha.jpg b/textures/pyriahair_alpha.jpg
new file mode 100644 (file)
index 0000000..ebef9f0
Binary files /dev/null and b/textures/pyriahair_alpha.jpg differ
diff --git a/textures/pyriahair_gloss.jpg b/textures/pyriahair_gloss.jpg
new file mode 100644 (file)
index 0000000..7d70f23
Binary files /dev/null and b/textures/pyriahair_gloss.jpg differ
diff --git a/textures/pyriahair_norm.jpg b/textures/pyriahair_norm.jpg
new file mode 100644 (file)
index 0000000..e95c171
Binary files /dev/null and b/textures/pyriahair_norm.jpg differ
diff --git a/textures/pyrianew.tga b/textures/pyrianew.tga
deleted file mode 100644 (file)
index b659f62..0000000
Binary files a/textures/pyrianew.tga and /dev/null differ
diff --git a/textures/pyrianew_gloss.jpg b/textures/pyrianew_gloss.jpg
deleted file mode 100644 (file)
index 8cd77a7..0000000
Binary files a/textures/pyrianew_gloss.jpg and /dev/null differ
diff --git a/textures/pyrianew_glow.jpg b/textures/pyrianew_glow.jpg
deleted file mode 100644 (file)
index 952dfd9..0000000
Binary files a/textures/pyrianew_glow.jpg and /dev/null differ
diff --git a/textures/pyrianew_glow.tga b/textures/pyrianew_glow.tga
deleted file mode 100644 (file)
index b1161db..0000000
Binary files a/textures/pyrianew_glow.tga and /dev/null differ
diff --git a/textures/pyrianew_norm.tga b/textures/pyrianew_norm.tga
deleted file mode 100644 (file)
index 4301faa..0000000
Binary files a/textures/pyrianew_norm.tga and /dev/null differ
diff --git a/textures/pyrianew_pants.tga b/textures/pyrianew_pants.tga
deleted file mode 100644 (file)
index 0b6a69c..0000000
Binary files a/textures/pyrianew_pants.tga and /dev/null differ
diff --git a/textures/pyrianew_shirt.tga b/textures/pyrianew_shirt.tga
deleted file mode 100644 (file)
index ff448ab..0000000
Binary files a/textures/pyrianew_shirt.tga and /dev/null differ
diff --git a/textures/pyrianewhair.jpg b/textures/pyrianewhair.jpg
deleted file mode 100644 (file)
index cc300fb..0000000
Binary files a/textures/pyrianewhair.jpg and /dev/null differ
diff --git a/textures/pyrianewhair_alpha.jpg b/textures/pyrianewhair_alpha.jpg
deleted file mode 100644 (file)
index ebef9f0..0000000
Binary files a/textures/pyrianewhair_alpha.jpg and /dev/null differ
diff --git a/textures/pyrianewhair_gloss.jpg b/textures/pyrianewhair_gloss.jpg
deleted file mode 100644 (file)
index 7d70f23..0000000
Binary files a/textures/pyrianewhair_gloss.jpg and /dev/null differ
diff --git a/textures/pyrianewhair_norm.jpg b/textures/pyrianewhair_norm.jpg
deleted file mode 100644 (file)
index e95c171..0000000
Binary files a/textures/pyrianewhair_norm.jpg and /dev/null differ
diff --git a/textures/rl.tga b/textures/rl.tga
new file mode 100644 (file)
index 0000000..67fdf6b
Binary files /dev/null and b/textures/rl.tga differ
diff --git a/textures/rl_gloss.jpg b/textures/rl_gloss.jpg
new file mode 100644 (file)
index 0000000..269fb58
Binary files /dev/null and b/textures/rl_gloss.jpg differ
diff --git a/textures/rl_norm.tga b/textures/rl_norm.tga
new file mode 100644 (file)
index 0000000..cdb53f8
Binary files /dev/null and b/textures/rl_norm.tga differ
diff --git a/textures/rl_pants.tga b/textures/rl_pants.tga
new file mode 100644 (file)
index 0000000..9f7cd2e
Binary files /dev/null and b/textures/rl_pants.tga differ
diff --git a/textures/rl_shirt.tga b/textures/rl_shirt.tga
new file mode 100644 (file)
index 0000000..9735bcf
Binary files /dev/null and b/textures/rl_shirt.tga differ
diff --git a/textures/xolar.tga b/textures/xolar.tga
deleted file mode 100644 (file)
index 4155a1d..0000000
Binary files a/textures/xolar.tga and /dev/null differ
diff --git a/textures/xolar_bump.tga b/textures/xolar_bump.tga
deleted file mode 100644 (file)
index 99d9990..0000000
Binary files a/textures/xolar_bump.tga and /dev/null differ
diff --git a/textures/xolar_gloss.tga b/textures/xolar_gloss.tga
deleted file mode 100644 (file)
index 74aabb4..0000000
Binary files a/textures/xolar_gloss.tga and /dev/null differ
diff --git a/textures/xolar_glow.tga b/textures/xolar_glow.tga
deleted file mode 100644 (file)
index 1477120..0000000
Binary files a/textures/xolar_glow.tga and /dev/null differ
diff --git a/textures/xolar_norm.tga b/textures/xolar_norm.tga
deleted file mode 100644 (file)
index 7bb6dc7..0000000
Binary files a/textures/xolar_norm.tga and /dev/null differ
diff --git a/textures/xolar_pants.tga b/textures/xolar_pants.tga
deleted file mode 100644 (file)
index 7968636..0000000
Binary files a/textures/xolar_pants.tga and /dev/null differ
diff --git a/textures/xolar_shirt.tga b/textures/xolar_shirt.tga
deleted file mode 100644 (file)
index 6a80b13..0000000
Binary files a/textures/xolar_shirt.tga and /dev/null differ
index c455c484dbd8baf60965ae21e8b69c4451a6392c..cdf28d72977e9a59810075d176a78b7154e6938b 100644 (file)
@@ -1,13 +1,10 @@
-**Team Leaders:
+(THIS FILE IS A HUGE TODO)
+(YES, REALLY, NOTHING HERE IS TRUE)
+(PLEASE FIX THIS FILE)
 
-Lee Vermeulen
-*Project Founder and Co-Designer
 
-Forest "LordHavoc" Hale
-*Lead Programmer and Co-Designer
+**Team Leaders:
 
-Rudolf "div0" Polzer
-*Programmer
 
 
 **Project maintainers:
@@ -19,6 +16,9 @@ Maik "SavageX" Merten
 
 **Development Team:
 
+Rudolf "div0" Polzer
+*Programmer
+
 Andreas "Black" Kirsch
 *Programmer
 
@@ -118,6 +118,9 @@ Gerd "Elysis" Raudenbusch
 Marius "GreEn`mArine" Shekow
 *Programmer
 
+Forest "LordHavoc" Hale
+*DarkPlaces Engine Programmer
+
 Braden "meoblast001" Walters
 *Music
 
@@ -169,6 +172,7 @@ Jitspoe
 Jody Gallagher
 Juergen "LowDragon" Timm
 Lee David Ash
+Lee Vermeulen
 Mathieu "Elric" Olivier
 Mephisto
 MirceaKitsune