Merge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'

diff --git a/Makefile b/Makefile
index 7128da2d683edadfd6d829cdc585b831a0b31689..e1d51f09dc0a562069da0a0184e300fa8b3c8903 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 ?= 
 

diff --git a/balance.cfg b/balance.cfg
index 37a36e8d9d0a2acd5618785b4f3e97b6f1a6d154..b7750d4d7b06fcd82d95ca562776a9d5920f1cea 100644 (file)
--- a/balance.cfg
+++ b/balance.cfg
@@ -20,6 +20,7 @@ set g_weaponreplace_hlac ""
 set g_weaponreplace_campingrifle ""
 set g_weaponreplace_tuba ""
 set g_weaponreplace_fireball ""
+set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
 // }}}
 
@@ -40,6 +41,7 @@ set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the
 set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 100
 set g_balance_armor_start 0
 set g_start_ammo_shells 45
@@ -309,6 +311,8 @@ set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 70
 set g_balance_grenadelauncher_secondary_damageforcescale 4
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 0
@@ -553,40 +557,91 @@ set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
 // }}}
 // {{{ fireball
-set g_balance_fireball_primary_ammo 5
-set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 40
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
 set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_damagetime 5
-set g_balance_fireball_primary_force 100
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
 set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 30
+set g_balance_fireball_primary_laserdamage 80
 set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 110
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 2
-set g_balance_fireball_primary_speed 900
-set g_balance_fireball_primary_speed_up 100
-set g_balance_fireball_primary_speed_z 0
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 25
-set g_balance_fireball_secondary_animtime 0.15
-set g_balance_fireball_secondary_bfgdamage 100
-set g_balance_fireball_secondary_bfgforce 500
-set g_balance_fireball_secondary_bfgradius 750
-set g_balance_fireball_secondary_damage 150
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_edgedamage 0
-set g_balance_fireball_secondary_force 700
-set g_balance_fireball_secondary_health 50
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
 set g_balance_fireball_secondary_laserdamage 30
 set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 256
-set g_balance_fireball_secondary_lifetime 15
-set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 0
-set g_balance_fireball_secondary_refire2 4
-set g_balance_fireball_secondary_speed 650
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
 // }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker

diff --git a/balance25.cfg b/balance25.cfg
index 11cc3a40ba08574826427a8b24733d841b0fba45..2f4ca97bcfa62f87fbcfecf71483e7963f8f6087 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -20,6 +20,7 @@ set g_weaponreplace_hlac ""
 set g_weaponreplace_campingrifle ""
 set g_weaponreplace_tuba ""
 set g_weaponreplace_fireball ""
+set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
 // }}}
 
@@ -40,6 +41,7 @@ set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the
 set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 150
 set g_balance_armor_start 0
 set g_start_ammo_shells 40
@@ -309,6 +311,8 @@ set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 0
@@ -553,40 +557,91 @@ set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
 // }}}
 // {{{ fireball
-set g_balance_fireball_primary_ammo 5
-set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 100
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
 set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_damagetime 5
-set g_balance_fireball_primary_force 100
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
 set g_balance_fireball_primary_laserburntime 0.5
 set g_balance_fireball_primary_laserdamage 80
 set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 128
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 1.5
-set g_balance_fireball_primary_speed 700
-set g_balance_fireball_primary_speed_up 100
-set g_balance_fireball_primary_speed_z 0
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 15
-set g_balance_fireball_secondary_animtime 0.15
-set g_balance_fireball_secondary_bfgdamage 200
-set g_balance_fireball_secondary_bfgforce 0
-set g_balance_fireball_secondary_bfgradius 1500
-set g_balance_fireball_secondary_damage 150
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_edgedamage 0
-set g_balance_fireball_secondary_force 700
-set g_balance_fireball_secondary_health 50
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 80
+set g_balance_fireball_secondary_laserdamage 50
 set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 256
-set g_balance_fireball_secondary_lifetime 15
-set g_balance_fireball_secondary_radius 200
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
 set g_balance_fireball_secondary_refire 2
-set g_balance_fireball_secondary_refire2 0
-set g_balance_fireball_secondary_speed 650
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
 // }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 19f7896188a8c8acd764d487c05e748d8fbc5291..e633c74329de875a5013c4b7cbc334b6ccee1a03 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -20,6 +20,7 @@ set g_weaponreplace_hlac 0 // I don't particularly like this weapon.
 set g_weaponreplace_campingrifle ""
 set g_weaponreplace_tuba ""
 set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it.
+set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
 // }}}
 
@@ -40,6 +41,7 @@ set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the
 set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 100
 set g_balance_armor_start 0
 set g_start_ammo_shells 45
@@ -309,6 +311,8 @@ set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 70
 set g_balance_grenadelauncher_secondary_damageforcescale 4
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 0
@@ -553,40 +557,91 @@ set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
 // }}}
 // {{{ fireball
-set g_balance_fireball_primary_ammo 5
-set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 40
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
 set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_damagetime 5
-set g_balance_fireball_primary_force 100
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
 set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 30
+set g_balance_fireball_primary_laserdamage 80
 set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 110
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 2
-set g_balance_fireball_primary_speed 900
-set g_balance_fireball_primary_speed_up 100
-set g_balance_fireball_primary_speed_z 0
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 25
-set g_balance_fireball_secondary_animtime 0.15
-set g_balance_fireball_secondary_bfgdamage 100
-set g_balance_fireball_secondary_bfgforce 500
-set g_balance_fireball_secondary_bfgradius 750
-set g_balance_fireball_secondary_damage 150
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_edgedamage 0
-set g_balance_fireball_secondary_force 700
-set g_balance_fireball_secondary_health 50
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 30
+set g_balance_fireball_secondary_laserdamage 50
 set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 256
-set g_balance_fireball_secondary_lifetime 15
-set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 0
-set g_balance_fireball_secondary_refire2 4
-set g_balance_fireball_secondary_speed 650
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
 // }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 20ed824e2ff8ab29b226f4289a75335a1f579106..f3b12059be0bc3a4ccd9333ee7aea8bf3d924ef7 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -19,6 +19,7 @@ set g_weaponreplace_hlac 0
 set g_weaponreplace_campingrifle 0
 set g_weaponreplace_tuba ""
 set g_weaponreplace_fireball 0
+set g_weaponreplace_seeker 0
 set sv_q3acompat_machineshotgunswap 0
 // }}}
 
@@ -39,6 +40,7 @@ set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the
 set g_start_weapon_campingrifle 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 125
 set g_balance_armor_start 0
 set g_start_ammo_shells 0
@@ -309,6 +311,8 @@ set g_balance_grenadelauncher_secondary_animtime 0.5
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 0
 set g_balance_grenadelauncher_secondary_damageforcescale 0
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 1
@@ -553,40 +557,91 @@ set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
 // }}}
 // {{{ fireball
-set g_balance_fireball_primary_ammo 5
-set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 40
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
 set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_damagetime 5
-set g_balance_fireball_primary_force 100
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
 set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 30
+set g_balance_fireball_primary_laserdamage 80
 set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 110
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 2
-set g_balance_fireball_primary_speed 900
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_primary_speed_up 100
-set g_balance_fireball_primary_speed_z 0
-set g_balance_fireball_secondary_ammo 25
-set g_balance_fireball_secondary_animtime 0.15
-set g_balance_fireball_secondary_bfgdamage 100
-set g_balance_fireball_secondary_bfgforce 500
-set g_balance_fireball_secondary_bfgradius 750
-set g_balance_fireball_secondary_damage 150
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_edgedamage 0
-set g_balance_fireball_secondary_force 700
-set g_balance_fireball_secondary_health 50
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 30
+set g_balance_fireball_secondary_laserdamage 50
 set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 256
-set g_balance_fireball_secondary_lifetime 15
-set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 0
-set g_balance_fireball_secondary_refire2 4
-set g_balance_fireball_secondary_speed 650
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
 // }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker

diff --git a/bots.txt b/bots.txt
index eab32aa2d9eacd708adf5e433329cbdda476109d..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       carni   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
-Toxic  carni   1       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
-Discovery      crash   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
-Pegasus        grunt   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
-Eureka headhunter      0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
-Airhead        insurrectionist 0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
-Gator  lurk    0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
-Delirium       lurk    1       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
-Death  lycanthrope     0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
-Scorcher       marine  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        pyria   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
-Lion   shock   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
-Sensible       skadi   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
-Shadow specop  0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
-Resurrection   visitant        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

diff --git a/config_update.cfg b/config_update.cfg
index 0143318be3e98c8aa12e4a1f110730582142e8e6..372784dd780c5cc14b7e4affc50518ddca673458 100644 (file)
--- a/config_update.cfg
+++ b/config_update.cfg
@@ -20,3 +20,6 @@ _update_configversion_$g_configversion
 _update_generic
 
 set g_configversion 2
+
+// we now use mastervolume
+volume 1

diff --git a/cubemaps/default/skynx.png b/cubemaps/default/skynx.png
new file mode 100644 (file)
index 0000000..8903c0b
Binary files /dev/null and b/cubemaps/default/skynx.png differ

diff --git a/cubemaps/default/skyny.png b/cubemaps/default/skyny.png
new file mode 100644 (file)
index 0000000..d11965e
Binary files /dev/null and b/cubemaps/default/skyny.png differ

diff --git a/cubemaps/default/skynz.png b/cubemaps/default/skynz.png
new file mode 100644 (file)
index 0000000..0bee498
Binary files /dev/null and b/cubemaps/default/skynz.png differ

diff --git a/cubemaps/default/skypx.png b/cubemaps/default/skypx.png
new file mode 100644 (file)
index 0000000..f2ac4e1
Binary files /dev/null and b/cubemaps/default/skypx.png differ

diff --git a/cubemaps/default/skypy.png b/cubemaps/default/skypy.png
new file mode 100644 (file)
index 0000000..4677f49
Binary files /dev/null and b/cubemaps/default/skypy.png differ

diff --git a/cubemaps/default/skypz.png b/cubemaps/default/skypz.png
new file mode 100644 (file)
index 0000000..3dde87a
Binary files /dev/null and b/cubemaps/default/skypz.png differ

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d373f9964dbf8488e827e8b5c58668c000ce9c9e..2c579ac49f137621eb316fe6e94c3d4db8ccd2ad 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -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"
@@ -193,6 +181,12 @@ seta crosshair_hlac_color_green 0.65       "crosshair color green component to display
 seta crosshair_hlac_color_blue 0.2     "crosshair color blue component to display when wielding the H.L.A.C."
 seta crosshair_hlac_color_alpha 1      "crosshair alpha value to display when wielding the H.L.A.C."
 seta crosshair_hlac_size 0.6   "crosshair size when wielding the H.L.A.C."
+seta crosshair_seeker ""       "crosshair to display when wielding the TAG Seeker"
+seta crosshair_seeker_color_red 1      "crosshair color red component to display when wielding the TAG seeker"
+seta crosshair_seeker_color_green 0.35 "crosshair color green component to display when wielding the TAG seeker"
+seta crosshair_seeker_color_blue 0.35  "crosshair color blue component to display when wielding the TAG seeker"
+seta crosshair_seeker_color_alpha 0.9  "crosshair alpha value to display when wielding the TAG seeker"
+seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker"
 seta crosshair_campingrifle "" "crosshair to display when wielding the campingrifle"
 seta crosshair_campingrifle_color_red 0.85     "crosshair color red component to display when wielding the campingrifle"
 seta crosshair_campingrifle_color_green 0.5    "crosshair color green component to display when wielding the campingrifle"
@@ -415,9 +409,9 @@ set bot_ai_keyboard_treshold 0.57
 set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim"
 set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming"
 set bot_ai_custom_weapon_priority_distances "300 850"  "Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons"
-set bot_ai_custom_weapon_priority_far   "minstanex nex campingrifle rocketlauncher grenadelauncher electro hagar hlac crylink laser uzi fireball shotgun tuba" "Desired weapons for far distances ordered by priority"
-set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba" "Desired weapons for middle distances ordered by priority"
-set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba hagar crylink grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball" "Desired weapons for close distances ordered by priority"
+set bot_ai_custom_weapon_priority_far   "minstanex nex campingrifle rocketlauncher grenadelauncher electro hagar hlac crylink laser uzi fireball seeker shotgun tuba"  "Desired weapons for far distances ordered by priority"
+set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba"  "Desired weapons for middle distances ordered by priority"
+set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba seeker hagar crylink grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball"  "Desired weapons for close distances ordered by priority"
 set bot_ai_weapon_combo 1      "Enable bots to do weapon combos"
 set bot_ai_weapon_combo_threshold 0.3  "Try to make a combo N seconds after the last attack"
 set bot_ai_friends_aware_pickup_radius "500"   "Bots will not pickup items if a team mate is this distance near the item"
@@ -1434,11 +1428,22 @@ alias sethostname "set menu_use_default_hostname 0; hostname $*"
 set sv_foginterval 0
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
-set g_cdtracks_remaplist "digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity thunder brokenlight brokenlight stairs sixtyfour_ desert3 ninesix sixtyfour_revisited northern-lights" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
-set g_cdtracks_dontusebydefault "digital-pursuit thunder brokenlight" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
+set _cdtrack_first "1"
+alias _cdtrack_0 "g_cdtracks_remaplist \"$g_cdtracks_remaplist $1\""
+alias _cdtrack_1 "g_cdtracks_remaplist \"$1\"; set _cdtrack_first 0"
+alias _cdtrack "_cdtrack_$_cdtrack_first $2"
+set g_cdtracks_remaplist ""
+exec cdtracks.cfg
+unset _cdtrack_first
+unalias _cdtrack_0
+unalias _cdtrack_1
+unalias _cdtrack
+
 cd remap $g_cdtracks_remaplist
 set sv_intermission_cdtrack ""
-set menu_cdtrack brokenlight
+
+set g_cdtracks_dontusebydefault ""
+set menu_cdtrack "ninesix"
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0
@@ -1471,14 +1476,14 @@ set g_jump_grunt 0      "Do you make a grunting noise every time you jump? Is it the
 alias allready "sv_cmd allready"
 
 // note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
-seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
+seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
 seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list"
-seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
-seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"      "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"
-seta cl_weaponpriority2 "minstanex nex campingrifle"                    "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun.  Default value: hitscan exact"
-seta cl_weaponpriority3 "minstanex nex campingrifle uzi shotgun"        "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun.  Default value: hitscan all"
-seta cl_weaponpriority4 "grenadelauncher hlac hagar crylink shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
-seta cl_weaponpriority5 "laser hook porto"                              "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun.  Default value: weapons for moving"
+seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
+seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"             "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"
+seta cl_weaponpriority2 "minstanex nex campingrifle"                           "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun.  Default value: hitscan exact"
+seta cl_weaponpriority3 "minstanex nex campingrifle uzi shotgun"               "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun.  Default value: hitscan all"
+seta cl_weaponpriority4 "grenadelauncher hlac hagar crylink seeker shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
+seta cl_weaponpriority5 "laser hook porto"                                     "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun.  Default value: weapons for moving"
 seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun"
 seta cl_weaponpriority7 "" "use impulse 207 for prev gun from this list, 217 for best gun, 227 for next gun"
 seta cl_weaponpriority8 "" "use impulse 208 for prev gun from this list, 218 for best gun, 228 for next gun"
@@ -1810,3 +1815,9 @@ seta cl_autodemo_delete_keeprecords 0 "when 1, records with a newly made race/ct
 
 // freeze camera
 set cl_lockview 0 "when 1, the camera does not move any more"
+
+// we now use mastervolume
+volume 1
+
+// sucks less than the old one
+cl_decals_newsystem 1

diff --git a/effectinfo.txt b/effectinfo.txt
index 7dfb6713439325289360315abe338136f2521f31..f915b0e53a250c298d2cf133c426541f134a0110 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -595,7 +595,7 @@ velocityjitter 0 0 256
 effect TE_TEI_G3
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xFFFFFF 0xFFFFFF
 size 4 4
 alpha 128 128 256
@@ -769,10 +769,11 @@ originjitter 11 11 11
 effect teleport
 count 1000
 type spark
-tex 40 40
-color 0x807aff 0x4463d5
-size 1 3
+tex 64 64
+color 0xff8400 0xff2a00
+size 1 1
 alpha 0 256 100
+stretchfactor 2
 //gravity 1
 bounce 1.5
 originjitter 1 1 1
@@ -780,6 +781,14 @@ velocityjitter 1000 1000 1500
 velocitymultiplier 0.5
 airfriction 2
 stretchfactor 0.6
+effect teleport
+countabsolute 1
+type smoke
+tex 65 65
+size 150 150
+alpha 190 190 180
+sizeincrease -80
+color 0xff8400 0xff2a00
 
 
 
@@ -873,20 +882,48 @@ lightcolor 2 2 2
 // used in qcsrc/server/w_hlac.qc:     pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_laser.qc:    pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect laser_muzzleflash
-count 1
+// glow and light
+countabsolute 1
 type smoke
-color 0xFFFFFF 0xFFFFFF
-tex 0 8
-size 5 5
-alpha 64 64 128
-airfriction 12
-originjitter 1.5 1.5 1.5
-velocityjitter 6 6 6
-velocitymultiplier 0.01
+color 0xcc0000 0xff0000
+tex 65 65
+size 10 15
+alpha 256 512 6280
+airfriction 10
+sizeincrease -100
+stretchfactor 2
 lightradius 200
 lightradiusfade 2000
 lightcolor 3 0.1 0.1
-
+// electricity
+effect laser_muzzleflash
+count 6
+type spark
+color 0xb44215 0xff0000
+tex 43 43
+size 5 7
+alpha 256 512 6280
+airfriction 10
+originjitter 2 2 2
+velocityjitter 150 150 150
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2.3
+rotate -180 180 4000 -4000
+// fire
+effect laser_muzzleflash
+count 12
+type spark
+color 0xff4200 0xff0000
+tex 8 15
+size 7 9
+alpha 256 512 6280
+airfriction 12
+originjitter 2 2 2
+velocityjitter 100 100 100
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2
 
 
 // decal
@@ -955,19 +992,17 @@ lightcolor 2 1.5 0.2
 sizeincrease 12
 velocitymultiplier 0.05
 effect shotgun_muzzleflash
-count 10
+count 32
 type spark
-tex 40 40
-color 0xFFFDD9 0xff5a00
-size 2 2
+tex 48 55
+color 0xffdb96 0xff5400
+size 10 20
 alpha 0 128 1024
 originjitter 1 1 1
-velocityjitter 444 444 444
-velocitymultiplier 1.7
-gravity 0.3
+velocityjitter 100 100 100
 airfriction 5
-
-
+stretchfactor 2.5
+velocitymultiplier 0.5
 
 // shotgun pellet impact
 // decal
@@ -976,7 +1011,7 @@ effect shotgun_impact
 countabsolute 1
 type decal
 tex 56 59
-size 3 3
+size 5 8
 alpha 256 256 0
 originjitter 10 10 10
 //lightradius 30
@@ -984,43 +1019,48 @@ originjitter 10 10 10
 //lightcolor 1 1 1
 // dust/smoke drifting away from the impact
 effect shotgun_impact
-count 5
-type smoke
+type alphastatic
+notunderwater
 tex 0 8
-color 0xFFFFFF 0xA37443
-size 7 7
-alpha 0 64 32
-originjitter 1 1 1
-airfriction 7
-liquidfriction 16
-velocityjitter 100 100 100
-sizeincrease 12
-velocitymultiplier 0.25
+count 6
+size 10 20
+sizeincrease 25
+alpha 300 550 756
+velocityjitter 150 150 150
+velocitymultiplier 0.2
+airfriction 5
+color 0x473a37 0x0b0a07
+rotate 0 360 -50 50
 // dust/smoke staying at the impact
 effect shotgun_impact
+type alphastatic
+notunderwater
+tex 36 36
 count 1
-type smoke
-tex 0 8
-color 0xFFFFFF 0xFFFFFF
-size 17 17
-alpha 64 64 32
-sizeincrease 4
+size 10 11
+sizeincrease 74
+alpha 200 350 500
+velocityjitter 11 11 11
+airfriction 5
+color 0x201d1a 0x000000
+bounce 6
+velocitymultiplier 0.03
+rotate 0 360 -50 50
 // sparks
 effect shotgun_impact
 notunderwater
-count 20
+count 3
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
 size 0.6 0.6
-alpha 256 256 768
+alpha 0 356 268
 gravity 1
-bounce 1
-airfriction 5
+bounce 1.5
+airfriction 1.1
 originjitter 1 1 1
-velocityjitter 400 400 400
-velocitymultiplier 0.1
-
+velocityjitter 200 200 200
+velocitymultiplier 0.2
 
 
 // used in qcsrc/server/w_uzi.qc:      pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
@@ -1051,10 +1091,10 @@ velocitymultiplier 0.5
 airfriction 12
 
 
-// decal
 // used in qcsrc/server/cl_client.qc:  //pointparticles(particleeffectnum("machinegun_impact"), self.origin + self.view_ofs + '0 0 7', '0 0 0', 1)
 // used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1)
 // used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1)
+// decal
 effect machinegun_impact
 countabsolute 1
 type decal
@@ -1067,42 +1107,64 @@ lightradiusfade 800
 lightcolor 6 3.6 0.6
 // dust/smoke drifting away from the impact
 effect machinegun_impact
-count 5
-type smoke
+type alphastatic
+notunderwater
 tex 0 8
-color 0xFFFFFF 0xA37443
-size 7 7
-alpha 0 64 32
-originjitter 1 1 1
-airfriction 7
-liquidfriction 16
-velocityjitter 100 100 100
-sizeincrease 12
-velocitymultiplier 0.25
+count 6
+size 10 20
+sizeincrease 15
+alpha 300 550 456
+velocityjitter 150 150 150
+velocitymultiplier 0.1
+airfriction 5
+color 0x473a37 0x0b0a07
+rotate 0 360 -50 50
 // dust/smoke staying at the impact
 effect machinegun_impact
+type alphastatic
+notunderwater
+tex 36 36
 count 1
-type smoke
-tex 0 8
-color 0xFFFFFF 0xFFFFFF
-size 17 17
-alpha 64 64 32
-sizeincrease 4
+size 10 11
+sizeincrease 74
+alpha 200 350 500
+velocityjitter 11 11 11
+airfriction 5
+color 0x201d1a 0x000000
+bounce 6
+velocitymultiplier 0.03
+rotate 0 360 -50 50
+//derbis
+effect machinegun_impact
+type alphastatic
+notunderwater
+tex 66 68
+count 2
+size 1 5
+airfriction 1
+gravity 1.4
+alpha 300 550 256
+velocityjitter 350 350 350
+velocitymultiplier 0.2
+bounce 1.7
+color 0x63493e 0xffffff
+rotate 0 360 -500 500
 // sparks
 effect machinegun_impact
 notunderwater
-count 20
+count 2
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
 size 0.3 0.3
-alpha 256 256 768
+alpha 256 256 168
 gravity 1
 bounce 1
-airfriction 5
+airfriction 2
 originjitter 1 1 1
-velocityjitter 400 400 400
-velocitymultiplier 0.1
+velocityjitter 300 300 300
+velocitymultiplier 0.2
+
 
 
 
@@ -1125,16 +1187,17 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect grenadelauncher_muzzleflash
-count 30
+count 32
 type spark
-tex 40 40
-color 0xFFFDD9 0xFFFDD9
-size 3 3
+tex 48 55
+color 0xffdb96 0xff5400
+size 10 20
 alpha 0 128 1024
 originjitter 1 1 1
-velocityjitter 300 300 300
+velocityjitter 100 100 100
 velocitymultiplier 0.5
-airfriction 12
+airfriction 5
+stretchfactor 2.5
 
 
 
@@ -1143,14 +1206,14 @@ airfriction 12
 // 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 6
-type alphastatic
-color 0x303030 0x000000
+trailspacing 2
+type smoke
+color 0x101010 0x000000
 tex 0 8
-size 1 2
+size 3 2
 bounce 1
-sizeincrease 2
-alpha 100 200 280
+sizeincrease 10
+alpha 300 400 780
 originjitter 1 1 1
 velocityjitter 1 1 1
 velocitymultiplier -0.02
@@ -1191,14 +1254,14 @@ 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 5
-type alphastatic
+trailspacing 3
+type smoke
 color 0x303030 0x000000
 tex 0 8
 size 3 3
 bounce 1
 sizeincrease 11
-alpha 100 200 400
+alpha 300 400 600
 originjitter 2 2 2
 velocityjitter 3 3 3
 velocitymultiplier -0.02
@@ -1234,55 +1297,55 @@ effect grenade_explode
 countabsolute 1
 type decal
 tex 8 16
-size 72 72
+size 48 48
 alpha 256 256 0
-originjitter 23 23 23
-lightradius 400
-lightradiusfade 750
+originjitter 26 26 26
+lightradius 250
+lightradiusfade 400
 lightcolor 8 4 1
-// fire effect
+// fire effect which expands then slows
 effect grenade_explode
 notunderwater
-count 64
+count 80
 type static
 tex 48 55
-color 0x8f0d00 0xff5a00
-size 33 44
-sizeincrease 45
-alpha 200 256 512
-bounce 1.5
+color 0xe03f00 0x5e0000
+size 16 26
+sizeincrease 20
+alpha 128 228 356
+bounce 4.5
 airfriction 8
 liquidfriction 8
 originjitter 8 8 8
-velocityjitter 512 512 512
-// fire effect 2
+velocityjitter 256 256 256
+// fire effect which make brigt dot inside
 effect grenade_explode
 notunderwater
-count 28
-type smoke
+count 30
+type static
 tex 48 55
-color 0xea691b 0xeed05a
-size 33 44
-sizeincrease 55
-alpha 200 256 612
-bounce 2.5
-airfriction 19
-liquidfriction 19
+color 0xe03f00 0xffdf92
+size 6 16
+sizeincrease 40
+alpha 228 328 756
+bounce 1
+airfriction 8
+liquidfriction 8
 originjitter 8 8 8
-velocityjitter 912 912 912
+velocityjitter 256 256 256
 // smoke
 effect grenade_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 64
+count 20
 size 20 40
-sizeincrease 44
-alpha 200 450 456
-velocityjitter 444 444 444
+sizeincrease 34
+alpha 300 550 556
+velocityjitter 256 256 256
 airfriction 5
 color 0x000000 0x111111
-bounce 2
+bounce 6
 // underwater bubbles
 effect grenade_explode
 underwater
@@ -1290,60 +1353,100 @@ count 64
 type bubble
 tex 62 62
 color 0x404040 0x808080
-size 3 3
+size 3 6
 alpha 128 256 64
 gravity -0.125
 bounce 1.5
 liquidfriction 0.25
 originjitter 16 16 16
-velocityjitter 144 144 144
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// underwatershockwave
+effect grenade_explode
+underwater
+type smoke
+countabsolute 1
+tex 33 33
+size 5 5
+sizeincrease 1500
+alpha 40 40 300
+velocitymultiplier 0.3
 // bouncing sparks
 effect grenade_explode
 notunderwater
-count 64
+count 32
 type spark
 tex 40 40
-color 0xffa800 0xffedaf
-size 1 1
-sizeincrease 2
-alpha 44 256 384
+color 0xffa35b 0xfff2be
+size 1 0.1
+alpha 644 956 484
 gravity 1
-airfriction -1
-bounce 1.5
+airfriction 1
+bounce 1.6
 liquidfriction 0.8
 velocityoffset 0 0 80
 originjitter 16 16 16
-velocityjitter 224 224 324
+velocityjitter 424 424 624
+// derbis
+effect grenade_explode
+notunderwater
+count 24
+type alphastatic
+tex 66 68
+color 0x6a3d25 0xcac5b4
+size 2 6
+alpha 644 956 684
+gravity 1.3
+airfriction 0.5
+bounce 1.6
+velocityjitter 324 324 524
+rotate -180 180 -1000 1000
 
 
 
 // used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect electro_muzzleflash
-count 1
+countabsolute 1
 type smoke
 color 0x283880 0x283880 // 0x202020 0x404040
-tex 0 8
-size 5 5
+tex 65 65
+size 15 15
 alpha 256 256 512
 originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
+sizeincrease -10
 velocitymultiplier 0.01
 lightradius 200
 lightradiusfade 2000
 lightcolor 1.5 3 6
+
 effect electro_muzzleflash
-count 30
+count 14
 type spark
-tex 31 31
+tex 8 15
 color 0xD9FDFF 0xD9FDFF
-size 3 3
-alpha 0 128 1024
+size 5 15
+alpha 110 228 2024
 originjitter 1 1 1
-velocityjitter 300 300 300
+velocityjitter 150 150 150
 velocitymultiplier 0.5
-airfriction 12
+airfriction 2
+stretchfactor 1.5
 
+effect electro_muzzleflash
+count 10
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 7 6
+alpha 110 228 1024
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 2.5
+airfriction 8
+gravity 1.3
+stretchfactor 0.1
 
 
 // electro trail
@@ -1391,6 +1494,16 @@ originjitter 17 17 17
 lightradius 250
 lightradiusfade 250
 lightcolor 3.125 4.375 10
+// shockwave
+effect electro_impact
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 1000
+color 0x80C0FF 0x80C0FF
+alpha 40 40 350
+velocitymultiplier 44
 // flare effect
 effect electro_impact
 countabsolute 1
@@ -1413,6 +1526,7 @@ gravity -0.3
 airfriction 6
 originjitter 1 1 1
 velocityjitter 512 512 512
+rotate -180 180 -9999 9999
 // inner cloud of smoke
 effect electro_impact
 count 60
@@ -1452,9 +1566,10 @@ count 128
 type spark
 tex 41 41
 color 0xFDFFD9 0xFDFFD9
-size 16 16
+size 1 2
 alpha 256 256 1024
 bounce 2
+stretchfactor 0.4
 //airfriction 2
 originjitter 1 1 1
 velocityjitter 512 512 512
@@ -1493,11 +1608,13 @@ size 48 48
 alpha 128 128 64
 // large sparks
 effect electro_combo
-count 20
+count 10
 type static
 color 0x2030FF 0x80C0FF
 size 32 32
-alpha 256 256 256
+sizeincrease 50
+tex 0 7
+alpha 156 156 156
 bounce 2
 airfriction 6
 liquidfriction 16
@@ -1507,13 +1624,16 @@ effect electro_combo
 count 64
 type spark
 tex 41 41
-color 0xFDFFD9 0xFDFFD9
-size 16 16
-alpha 444 512 866
-bounce 2
+color 0xa9cacf 0x0054ff
+size 2 4
+stretchfactor 2
+gravity 0.3
+alpha 444 512 700
+velocitymultiplier 3
+bounce 1.6
 //airfriction 2
 originjitter 1 1 1
-velocityjitter 512 512 512
+velocityjitter 312 312 312
 // inner cloud of smoke
 effect electro_combo
 count 0.25
@@ -1524,6 +1644,16 @@ size 24 24
 alpha 256 256 256
 originjitter 20 20 20
 velocityjitter 32 32 32
+// shockwave
+effect electro_combo
+type smoke
+countabsolute 1
+color 0xa9cacf 0x0054ff
+tex 33 33
+size 30 30
+sizeincrease 600
+alpha 40 40 100
+velocitymultiplier 0.3
 
 
 
@@ -1532,12 +1662,10 @@ velocityjitter 32 32 32
 effect crylink_muzzleflash
 count 1
 type smoke
-color 0x202020 0x404040
-tex 0 8
-size 5 5
-alpha 128 128 256
-originjitter 1.5 1.5 1.5
-velocityjitter 6 6 6
+color 0xdd9cff 0xff0090
+tex 65 65
+size 15 20
+alpha 128 128 2024
 velocitymultiplier 0.01
 lightradius 200
 lightradiusfade 2000
@@ -1545,15 +1673,15 @@ lightcolor 1.6 0.2 2
 effect crylink_muzzleflash
 count 10
 type spark
-tex 40 40
+tex 35 36
 color 0xA080C0 0xA080C0
-size 3 3
+size 5 10
 alpha 0 128 1024
 originjitter 1 1 1
 velocityjitter 200 200 200
 velocitymultiplier 0.3
 airfriction 12
-
+stretchfactor 1.5
 
 
 // crylink impact effect
@@ -1584,7 +1712,7 @@ type spark
 tex 41 41
 color 0xA040C0 0xA040C0
 bounce 2
-size 4 4
+size 1 2
 alpha 256 256 1024
 velocityjitter 256 256 256
 // purple splash
@@ -1609,28 +1737,31 @@ 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 10
-type smoke
-color 0x202020 0x404040
-tex 0 8
+count 24
+type spark
+color 0x202020 0x0072ff
+tex 48 55
 size 16 16
-alpha 128 128 192
+alpha 328 328 4000
 originjitter 4 4 4
-velocityjitter 24 24 24
-velocitymultiplier 0.02
+velocityjitter 180 180 180
+velocitymultiplier 1.4
+stretchfactor 2
+sizeincrease -100
+airfriction 9
 lightradius 200
 lightradiusfade 200
 lightcolor 2 2.5 3
 effect nex_muzzleflash
-count 150
+count 100
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
-size 3 3
+size 1 1
 alpha 0 128 1024
 originjitter 1 1 1
 velocityjitter 600 600 600
-velocitymultiplier 0.5
+velocitymultiplier 1.5
 airfriction 9
 
 
@@ -1639,7 +1770,7 @@ airfriction 9
 //effect nex_beam
 //countabsolute 1
 //type beam
-//tex 60 60
+//tex 200 200
 //color 0xFFFFFF 0xFFFFFF
 //size 6 6
 //alpha 128 128 192
@@ -1698,15 +1829,35 @@ originjitter 14 14 14
 lightradius 200
 lightradiusfade 250
 lightcolor 4 6 8
+rotate -180 180 0 0
+// rotating something
+effect nex_impact
+count 10
+type smoke
+tex 46 46
+color 0x1680A0 0x1680A0
+size 25 28
+sizeincrease 20
+alpha 55 55 50
+rotate 180 -180 500 -500
 // shockwave
 effect nex_impact
 countabsolute 1
 type static
-tex 34 34
-size 16 16
-alpha 100 100 300
-sizeincrease 200
-
+tex 33 33
+color 0x1680A0 0x1680A0
+size 16 16
+alpha 50 50 400
+sizeincrease 900
+// shockwave2
+effect nex_impact
+countabsolute 1
+type static
+tex 65 65
+color 0x1680A0 0x1680A0
+size 5 5
+alpha 50 50 100
+sizeincrease 500
 
 // flare effect
 effect nex_impact
@@ -1736,11 +1887,24 @@ color 0xD9FDFF 0xD9FDFF
 size 4 4
 alpha 0 128 512
 bounce 2
+stretchfactor 3
 velocityjitter 600 600 600
 velocitymultiplier 0.5
 airfriction 9
-
-
+// small sparks that live longer
+effect nex_impact
+count 32
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 2 2
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 300 300 600
+velocitymultiplier 2.5
+airfriction 2
+gravity 1
 
 // used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
@@ -1761,14 +1925,16 @@ lightcolor 2 1.5 0.2
 effect hagar_muzzleflash
 count 30
 type spark
-tex 40 40
-color 0xFFFDD9 0xFFFDD9
-size 3 3
+tex 48 55
+color 0xff8400 0xff4200
+size 5 10
 alpha 0 128 1024
 originjitter 1 1 1
-velocityjitter 300 300 300
+velocityjitter 200 200 200
 velocitymultiplier 0.5
 airfriction 12
+stretchfactor 2
+rotate -180 180 -400 400
 
 
 
@@ -1878,18 +2044,19 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect hagar_explode
 notunderwater
-count 16
+count 8
 type spark
-color 0x903010 0xFFD030
-size 2 2
 tex 40 40
-alpha 256 256 384
+color 0xffa35b 0xfff2be
+size 1 0.1
+alpha 644 956 684
 gravity 1
-airfriction 0.2
-bounce 1.5
+airfriction 1
+bounce 1.6
 liquidfriction 0.8
 velocityoffset 0 0 80
-velocityjitter 256 256 256
+originjitter 16 16 16
+velocityjitter 224 224 224
 
 
 
@@ -1910,16 +2077,18 @@ velocitymultiplier -0.13
 //lightradiusfade 2000
 //lightcolor 2 1.5 0.2
 effect rocketlauncher_muzzleflash
-count 30
-type spark
-tex 40 40
+count 12
+type smoke
+tex 35 36
 color 0xFFFDD9 0xFFFDD9
-size 3 3
-alpha 0 128 1024
-originjitter 1 1 1
-velocityjitter 300 300 300
-velocitymultiplier 0.5
-airfriction 12
+size 5 10
+sizeincrease 20
+alpha 10 25 20
+originjitter 3 3 3
+velocityjitter 100 100 100
+velocitymultiplier 0.3
+airfriction 9
+rotate -180 180 -30 30
 
 
 
@@ -1931,10 +2100,11 @@ airfriction 12
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
 effect TR_ROCKET
 trailspacing 5
-type alphastatic
+type smoke
+notunderwater
 color 0x000000 0x666666
 tex 0 8
-size 1 4
+size 3 4
 bounce 1
 sizeincrease 11
 alpha 200 300 200
@@ -1944,10 +2114,10 @@ lightcolor 6 3 1
 originjitter 2 2 2
 velocityjitter 3 3 3
 velocitymultiplier -0.02
+rotate -180 180 -30 30
 //gravity -0.11
 // fire
 effect TR_ROCKET
-notunderwater
 trailspacing 2
 type static
 color 0xffdf72 0x811200
@@ -1960,25 +2130,28 @@ velocityjitter 32 32 32
 velocitymultiplier -1.5
 // bubbles
 effect TR_ROCKET
+type bubble
 underwater
 trailspacing 8
-type bubble
 tex 62 62
-color 0x404040 0x808080
-size 1 1
+size 1 2
 alpha 256 256 256
 gravity -0.125
 bounce 1.5
 liquidfriction 4
 velocityjitter 16 16 16
+velocitymultiplier -0.31
+rotate 0 0 0 0
 // sparks
 effect TR_ROCKET
+notunderwater
 trailspacing 10
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
-size 1 1
+size 0.5 0.5
 alpha 444 512 1866
+stretchfactor 0.3
 //gravity 1
 bounce 1
 //velocityoffset 0 0 15
@@ -1992,59 +2165,59 @@ effect rocket_explode
 countabsolute 1
 type decal
 tex 8 16
-size 48 48
+size 72 72
 alpha 256 256 0
-originjitter 26 26 26
-lightradius 250
-lightradiusfade 400
+originjitter 23 23 23
+lightradius 400
+lightradiusfade 750
 lightcolor 8 4 1
-// fire effect which expands then slows
+// fire effect
 effect rocket_explode
 notunderwater
-count 80
+count 64
 type static
 tex 48 55
-color 0xe03f00 0x5e0000
-size 16 26
-sizeincrease 20
-alpha 128 228 356
-bounce 4.5
+color 0x8f0d00 0xff5a00
+size 33 44
+sizeincrease 45
+alpha 200 256 512
+bounce 1.5
 airfriction 8
 liquidfriction 8
 originjitter 8 8 8
-velocityjitter 256 256 256
-// fire effect which make brigt dot inside
+velocityjitter 512 512 512
+// fire effect 2
 effect rocket_explode
 notunderwater
-count 30
-type static
+count 28
+type smoke
 tex 48 55
-color 0xe03f00 0xffdf92
-size 6 16
-sizeincrease 40
-alpha 228 328 756
-bounce 1
-airfriction 8
-liquidfriction 8
+color 0xea691b 0xeed05a
+size 33 44
+sizeincrease 55
+alpha 200 256 612
+bounce 2.5
+airfriction 19
+liquidfriction 19
 originjitter 8 8 8
-velocityjitter 256 256 256
+velocityjitter 912 912 912
 // smoke
 effect rocket_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 20
+count 64
 size 20 40
-sizeincrease 34
-alpha 300 550 556
-velocityjitter 256 256 256
+sizeincrease 44
+alpha 200 450 456
+velocityjitter 444 444 444
 airfriction 5
 color 0x000000 0x111111
-bounce 6
+bounce 2
 // underwater bubbles
 effect rocket_explode
 underwater
-count 32
+count 64
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2054,24 +2227,47 @@ gravity -0.125
 bounce 1.5
 liquidfriction 0.25
 originjitter 16 16 16
-velocityjitter 96 96 96
+velocityjitter 144 144 144
+// underwatershockwave
+effect rocket_explode
+underwater
+type smoke
+countabsolute 1
+tex 33 33
+size 30 30
+sizeincrease 1900
+alpha 40 40 300
+velocitymultiplier 0.3
 // bouncing sparks
 effect rocket_explode
 notunderwater
-count 16
+count 32
 type spark
-color 0x903010 0xFFD030
-size 2 2
 tex 40 40
-alpha 256 256 384
+color 0xffa35b 0xfff2be
+size 1 0.1
+alpha 644 956 484
 gravity 1
-airfriction 0.2
-bounce 1.5
+airfriction 1
+bounce 1.6
 liquidfriction 0.8
 velocityoffset 0 0 80
-velocityjitter 256 256 256
-
-
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect rocket_explode
+notunderwater
+count 24
+type alphastatic
+tex 66 68
+color 0x6a3d25 0xcac5b4
+size 2 6
+alpha 644 956 684
+gravity 1.3
+airfriction 0.5
+bounce 1.6
+velocityjitter 324 324 524
+rotate -180 180 -1000 1000
 
 // used in qcsrc/server/g_hook.qc:     pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1)
 effect grapple_muzzleflash
@@ -2093,7 +2289,7 @@ lightcolor 1 0 0
 effect nex242_misc_laser_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0xff0000 0xff0000
@@ -2117,7 +2313,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_beam_fast
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 640
 color 0xff0000 0xff0000
@@ -2140,7 +2336,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_green_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0x00ff00 0x00ff00
@@ -2162,7 +2358,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_blue_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0x0000ff 0x0000ff
@@ -2184,7 +2380,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_yellow_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0xffff00 0xffff00
@@ -2206,7 +2402,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_cyan_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0x00ffff 0x00ffff
@@ -2228,7 +2424,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_magenta_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0xff00ff 0xff00ff
@@ -2250,7 +2446,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_white_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0xffffff 0xffffff
@@ -2272,7 +2468,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_black_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0x000000 0x000000
@@ -2294,7 +2490,7 @@ velocitymultiplier 100
 effect nex242_misc_laser_orange_beam
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 size 1 1
 alpha 256 256 64
 color 0xff6600 0xff6600
@@ -2452,6 +2648,7 @@ airfriction 3
 liquidfriction 6
 velocityjitter 512 512 512
 
+
 // decal
 // used in qcsrc/server/g_triggers.qc:                                 self.cnt = particleeffectnum("laser_deadly")
 // used in qcsrc/server/g_triggers.qc:                 self.cnt = particleeffectnum("laser_deadly")
@@ -3191,8 +3388,8 @@ trailspacing 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
-size 3 3
-stretchfactor 0.6
+size 1.5 1.5
+stretchfactor 1
 velocitymultiplier 0.7
 
 // smoke emitter for small pipes
@@ -3594,41 +3791,42 @@ originjitter 10 10 10
 effect morphed_damage_dissolve
 tex 43 43
 count 20
-type spark
+type smoke
 color 0xffffff 0x9271fb
-size 62 62
+size 40 40
 sizeincrease -16
-alpha 256 256 328
-gravity -0.4
-airfriction 3
+alpha 456 456 1828
+gravity -1.9
+airfriction 8
 liquidfriction 6
 velocityjitter 256 256 512
+rotate -180 180 -399 -99
 
 effect morphed_damage_dissolve
 tex 43 43
 count 5
-type spark
+type smoke
 color 0x7bdbff 0xbed2ff
-size 62 62
+size 40 40
 sizeincrease -16
-alpha 256 256 328
+alpha 256 256 628
 gravity -0.8
-airfriction 5
+airfriction 9
 liquidfriction 6
 velocityjitter 256 256 512
+rotate -180 180 0 0
 
 effect morphed_damage_dissolve
-tex 0 8
+tex 65 65
 count 10
 type smoke
 color 0xffffff 0x9271fb
 size 44 44
 sizeincrease -16
-alpha 256 256 228
+alpha 156 156 128
 airfriction 3
 liquidfriction 6
-originjitter 32 32 96
-
+originjitter 22 22 76
 
 effect morphed_damage_dissolve
 tex 46 46
@@ -3637,18 +3835,19 @@ type smoke
 color 0xffffff 0x9271fb
 size 32 32
 sizeincrease -16
-alpha 256 256 228
+alpha 56 56 128
 gravity 1
 bounce 1.5
 airfriction 3
 liquidfriction 6
 velocityjitter 400 400 0
+rotate -180 180 999 -999
 
 // Team / hit minsta effects
 effect TE_TEI_G3RED
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xFF0000 0xFF0000
 size 4 4
 alpha 128 128 256
@@ -3669,7 +3868,7 @@ type smoke
 effect TE_TEI_G3RED_HIT
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xFF0000 0xFF0000
 size 8 8
 alpha 128 128 256
@@ -3700,7 +3899,7 @@ type smoke
 effect TE_TEI_G3BLUE
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0x0000FF 0x1100FF
 size 4 4
 alpha 128 128 256
@@ -3721,7 +3920,7 @@ type smoke
 effect TE_TEI_G3BLUE_HIT
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0x0000FF 0x1100FF
 size 8 8
 alpha 128 128 256
@@ -3753,7 +3952,7 @@ type smoke
 effect TE_TEI_G3YELLOW
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xffff00 0xffff11
 size 4 4
 alpha 128 128 256
@@ -3772,7 +3971,7 @@ type smoke
 effect TE_TEI_G3YELLOW_HIT
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xffff00 0xffff11
 size 8 8
 alpha 128 128 256
@@ -3803,7 +4002,7 @@ type smoke
 effect TE_TEI_G3PINK
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xFF00FF 0xFF11FF
 size 4 4
 alpha 128 128 256
@@ -3824,7 +4023,7 @@ type smoke
 effect TE_TEI_G3PINK_HIT
 countabsolute 1
 type beam
-tex 60 60
+tex 200 200
 color 0xFF00FF 0xFF11FF
 size 8 8
 alpha 128 128 256
@@ -4467,8 +4666,8 @@ trailspacing 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
-size 3 3
-stretchfactor 0.6
+size 1.5 1.5
+stretchfactor 1
 velocitymultiplier 0.7
 effect tr_rifle
 notunderwater
@@ -4498,20 +4697,6 @@ velocityjitter 16 16 16
 
 
 // rocket guiding start
-// smoke
-effect rocket_guide
-type alphastatic
-notunderwater
-tex 0 8
-count 5
-size 10 20
-sizeincrease 17
-alpha 300 550 556
-velocityjitter 128 128 128
-airfriction 5
-color 0x000000 0x111111
-bounce 6
-velocitymultiplier -0.1
 // underwater bubbles
 effect rocket_guide
 underwater
@@ -4533,16 +4718,25 @@ notunderwater
 count 16
 type spark
 color 0x903010 0xFFD030
-size 2 2
+size 0.3 0.7
 tex 40 40
-alpha 256 256 384
+alpha 256 256 984
 gravity 1
 airfriction 0.2
 bounce 1.5
 liquidfriction 0.8
 velocityoffset 0 0 80
-velocityjitter 256 256 256
-velocitymultiplier -0.1
+velocityjitter 156 156 156
+velocitymultiplier -0.3
+stretchfactor 0.4
+effect rocket_guide
+countabsolute 1
+type smoke
+tex 65 65
+color 0x903010 0xFFD030
+size 10 10
+sizeincrease 300
+alpha 100 100 500
 
 
 // gauntlet laser
@@ -4631,16 +4825,85 @@ velocitymultiplier 20
 velocityoffset 0 0 10
 airfriction 1
 
-// effect for respawn ghosts
-// used in qcsrc/server/cl_client.qc:          pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1)
-effect respawn_ghost
-count 75
-type static
-color 0xA0A0A0 0xFFFFFF
-size 2 2
-alpha 32 64 128
-airfriction 1
-liquidfriction 4
-originoffset 0 0 -8
-originjitter 28 28 16
-velocityjitter 0 0 256
\ No newline at end of file
+//happy death fx for cl_gentle
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0x00FFFF 0xFF00FF
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0xFF00FF 0xFFFF00
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0xFFFF00 0x00FFFF
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+
+
+//happy damage fx for cl_gentle
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0x00FFFF 0xFF00FF
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0xFF00FF 0xFFFF00
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0xFFFF00 0x00FFFF
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index cfce0c470bb6c6a53bc4467f54cf6193fa8b1dc6..123600875ac7ab55c041f99a5be68a93192ee926 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -14,7 +14,7 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
 r_glsl_offsetmapping_reliefmapping 1
-r_hdr 1
+r_hdr 2
 r_motionblur 0.5
 r_picmipworld 0
 r_shadow_gloss 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

diff --git a/gfx/crosshairseeker.tga b/gfx/crosshairseeker.tga
new file mode 100644 (file)
index 0000000..7311550
Binary files /dev/null and b/gfx/crosshairseeker.tga differ

diff --git a/gfx/hud/inv_weapon13.tga b/gfx/hud/inv_weapon13.tga
index ba59acaf143a73b01261307cc95c6051313054d3..0a8cf7ed023f1c5ae882d69cd178e6dfb158f081 100644 (file)
Binary files a/gfx/hud/inv_weapon13.tga and b/gfx/hud/inv_weapon13.tga differ

diff --git a/gfx/hud/inv_weaponseeker.tga b/gfx/hud/inv_weaponseeker.tga
new file mode 100644 (file)
index 0000000..0a8cf7e
Binary files /dev/null and b/gfx/hud/inv_weaponseeker.tga differ

diff --git a/gfx/menu/wickedx/background.tga b/gfx/menu/wickedx/background.tga
new file mode 100644 (file)
index 0000000..d785d64
Binary files /dev/null and b/gfx/menu/wickedx/background.tga differ

diff --git a/gfx/menu/wickedx/background_ingame.tga b/gfx/menu/wickedx/background_ingame.tga
new file mode 100644 (file)
index 0000000..2532d17
Binary files /dev/null and b/gfx/menu/wickedx/background_ingame.tga differ

diff --git a/gfx/menu/wickedx/background_l2.tga b/gfx/menu/wickedx/background_l2.tga
new file mode 100644 (file)
index 0000000..2532d17
Binary files /dev/null and b/gfx/menu/wickedx/background_l2.tga differ

diff --git a/gfx/menu/wickedx/bigbutton_c.tga b/gfx/menu/wickedx/bigbutton_c.tga
new file mode 100644 (file)
index 0000000..a8bf8ad
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_c.tga differ

diff --git a/gfx/menu/wickedx/bigbutton_d.tga b/gfx/menu/wickedx/bigbutton_d.tga
new file mode 100644 (file)
index 0000000..f6a832b
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_d.tga differ

diff --git a/gfx/menu/wickedx/bigbutton_f.tga b/gfx/menu/wickedx/bigbutton_f.tga
new file mode 100644 (file)
index 0000000..c4cda96
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_f.tga differ

diff --git a/gfx/menu/wickedx/bigbutton_n.tga b/gfx/menu/wickedx/bigbutton_n.tga
new file mode 100644 (file)
index 0000000..d54d5d5
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_n.tga differ

diff --git a/gfx/menu/wickedx/bigbuttongray_c.tga b/gfx/menu/wickedx/bigbuttongray_c.tga
new file mode 100644 (file)
index 0000000..38e9653
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_c.tga differ

diff --git a/gfx/menu/wickedx/bigbuttongray_d.tga b/gfx/menu/wickedx/bigbuttongray_d.tga
new file mode 100644 (file)
index 0000000..959ef93
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_d.tga differ

diff --git a/gfx/menu/wickedx/bigbuttongray_f.tga b/gfx/menu/wickedx/bigbuttongray_f.tga
new file mode 100644 (file)
index 0000000..55ff591
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_f.tga differ

diff --git a/gfx/menu/wickedx/bigbuttongray_n.tga b/gfx/menu/wickedx/bigbuttongray_n.tga
new file mode 100644 (file)
index 0000000..edff6d6
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_n.tga differ

diff --git a/gfx/menu/wickedx/border.tga b/gfx/menu/wickedx/border.tga
new file mode 100644 (file)
index 0000000..d435e60
Binary files /dev/null and b/gfx/menu/wickedx/border.tga differ

diff --git a/gfx/menu/wickedx/button_c.tga b/gfx/menu/wickedx/button_c.tga
new file mode 100644 (file)
index 0000000..745ee7c
Binary files /dev/null and b/gfx/menu/wickedx/button_c.tga differ

diff --git a/gfx/menu/wickedx/button_d.tga b/gfx/menu/wickedx/button_d.tga
new file mode 100644 (file)
index 0000000..6639525
Binary files /dev/null and b/gfx/menu/wickedx/button_d.tga differ

diff --git a/gfx/menu/wickedx/button_f.tga b/gfx/menu/wickedx/button_f.tga
new file mode 100644 (file)
index 0000000..817d849
Binary files /dev/null and b/gfx/menu/wickedx/button_f.tga differ

diff --git a/gfx/menu/wickedx/button_n.tga b/gfx/menu/wickedx/button_n.tga
new file mode 100644 (file)
index 0000000..643360e
Binary files /dev/null and b/gfx/menu/wickedx/button_n.tga differ

diff --git a/gfx/menu/wickedx/buttongray_c.tga b/gfx/menu/wickedx/buttongray_c.tga
new file mode 100644 (file)
index 0000000..032ea91
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_c.tga differ

diff --git a/gfx/menu/wickedx/buttongray_d.tga b/gfx/menu/wickedx/buttongray_d.tga
new file mode 100644 (file)
index 0000000..55f1e62
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_d.tga differ

diff --git a/gfx/menu/wickedx/buttongray_f.tga b/gfx/menu/wickedx/buttongray_f.tga
new file mode 100644 (file)
index 0000000..5ed3a7d
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_f.tga differ

diff --git a/gfx/menu/wickedx/buttongray_n.tga b/gfx/menu/wickedx/buttongray_n.tga
new file mode 100644 (file)
index 0000000..6ba22b5
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_n.tga differ

diff --git a/gfx/menu/wickedx/charmap.tga b/gfx/menu/wickedx/charmap.tga
new file mode 100755 (executable)
index 0000000..d8ed1d5
Binary files /dev/null and b/gfx/menu/wickedx/charmap.tga differ

diff --git a/gfx/menu/wickedx/charmapbutton.tga b/gfx/menu/wickedx/charmapbutton.tga
new file mode 100644 (file)
index 0000000..54fe07e
Binary files /dev/null and b/gfx/menu/wickedx/charmapbutton.tga differ

diff --git a/gfx/menu/wickedx/checkbox_c0.tga b/gfx/menu/wickedx/checkbox_c0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_c0.tga differ

diff --git a/gfx/menu/wickedx/checkbox_c1.tga b/gfx/menu/wickedx/checkbox_c1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_c1.tga differ

diff --git a/gfx/menu/wickedx/checkbox_d0.tga b/gfx/menu/wickedx/checkbox_d0.tga
new file mode 100644 (file)
index 0000000..40efe7a
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_d0.tga differ

diff --git a/gfx/menu/wickedx/checkbox_d1.tga b/gfx/menu/wickedx/checkbox_d1.tga
new file mode 100644 (file)
index 0000000..bba6824
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_d1.tga differ

diff --git a/gfx/menu/wickedx/checkbox_f0.tga b/gfx/menu/wickedx/checkbox_f0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_f0.tga differ

diff --git a/gfx/menu/wickedx/checkbox_f1.tga b/gfx/menu/wickedx/checkbox_f1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_f1.tga differ

diff --git a/gfx/menu/wickedx/checkbox_n0.tga b/gfx/menu/wickedx/checkbox_n0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_n0.tga differ

diff --git a/gfx/menu/wickedx/checkbox_n1.tga b/gfx/menu/wickedx/checkbox_n1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_n1.tga differ

diff --git a/gfx/menu/wickedx/checkmark.tga b/gfx/menu/wickedx/checkmark.tga
new file mode 100644 (file)
index 0000000..cf34dde
Binary files /dev/null and b/gfx/menu/wickedx/checkmark.tga differ

diff --git a/gfx/menu/wickedx/closebutton_c.tga b/gfx/menu/wickedx/closebutton_c.tga
new file mode 100644 (file)
index 0000000..56488ec
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_c.tga differ

diff --git a/gfx/menu/wickedx/closebutton_f.tga b/gfx/menu/wickedx/closebutton_f.tga
new file mode 100644 (file)
index 0000000..7338573
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_f.tga differ

diff --git a/gfx/menu/wickedx/closebutton_n.tga b/gfx/menu/wickedx/closebutton_n.tga
new file mode 100644 (file)
index 0000000..e4b6058
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_n.tga differ

diff --git a/gfx/menu/wickedx/color.tga b/gfx/menu/wickedx/color.tga
new file mode 100755 (executable)
index 0000000..5189ab4
Binary files /dev/null and b/gfx/menu/wickedx/color.tga differ

diff --git a/gfx/menu/wickedx/colorbutton_c.tga b/gfx/menu/wickedx/colorbutton_c.tga
new file mode 100644 (file)
index 0000000..1c294f7
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_c.tga differ

diff --git a/gfx/menu/wickedx/colorbutton_f.tga b/gfx/menu/wickedx/colorbutton_f.tga
new file mode 100644 (file)
index 0000000..0031c35
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_f.tga differ

diff --git a/gfx/menu/wickedx/colorbutton_n.tga b/gfx/menu/wickedx/colorbutton_n.tga
new file mode 100755 (executable)
index 0000000..7fec859
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_n.tga differ

diff --git a/gfx/menu/wickedx/colorpicker.tga b/gfx/menu/wickedx/colorpicker.tga
new file mode 100755 (executable)
index 0000000..6f9845b
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker.tga differ

diff --git a/gfx/menu/wickedx/colorpicker_m.tga b/gfx/menu/wickedx/colorpicker_m.tga
new file mode 100755 (executable)
index 0000000..6775942
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_m.tga differ

diff --git a/gfx/menu/wickedx/crosshairbutton_c.tga b/gfx/menu/wickedx/crosshairbutton_c.tga
new file mode 100644 (file)
index 0000000..1c294f7
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_c.tga differ

diff --git a/gfx/menu/wickedx/crosshairbutton_d.tga b/gfx/menu/wickedx/crosshairbutton_d.tga
new file mode 100755 (executable)
index 0000000..110faa1
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_d.tga differ

diff --git a/gfx/menu/wickedx/crosshairbutton_f.tga b/gfx/menu/wickedx/crosshairbutton_f.tga
new file mode 100644 (file)
index 0000000..0031c35
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_f.tga differ

diff --git a/gfx/menu/wickedx/crosshairbutton_n.tga b/gfx/menu/wickedx/crosshairbutton_n.tga
new file mode 100755 (executable)
index 0000000..ac94535
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_n.tga differ

diff --git a/gfx/menu/wickedx/cursor.tga b/gfx/menu/wickedx/cursor.tga
new file mode 100644 (file)
index 0000000..0a2e295
Binary files /dev/null and b/gfx/menu/wickedx/cursor.tga differ

diff --git a/gfx/menu/wickedx/inputbox_f.tga b/gfx/menu/wickedx/inputbox_f.tga
new file mode 100644 (file)
index 0000000..6b5bd20
Binary files /dev/null and b/gfx/menu/wickedx/inputbox_f.tga differ

diff --git a/gfx/menu/wickedx/inputbox_n.tga b/gfx/menu/wickedx/inputbox_n.tga
new file mode 100644 (file)
index 0000000..ad169c2
Binary files /dev/null and b/gfx/menu/wickedx/inputbox_n.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_c0.tga b/gfx/menu/wickedx/radiobutton_c0.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_c0.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_c1.tga b/gfx/menu/wickedx/radiobutton_c1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_c1.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_d0.tga b/gfx/menu/wickedx/radiobutton_d0.tga
new file mode 100644 (file)
index 0000000..f935318
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_d0.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_d1.tga b/gfx/menu/wickedx/radiobutton_d1.tga
new file mode 100644 (file)
index 0000000..1bcc41d
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_d1.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_f0.tga b/gfx/menu/wickedx/radiobutton_f0.tga
new file mode 100644 (file)
index 0000000..237e09b
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_f0.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_f1.tga b/gfx/menu/wickedx/radiobutton_f1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_f1.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_n0.tga b/gfx/menu/wickedx/radiobutton_n0.tga
new file mode 100644 (file)
index 0000000..55dae24
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_n0.tga differ

diff --git a/gfx/menu/wickedx/radiobutton_n1.tga b/gfx/menu/wickedx/radiobutton_n1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_n1.tga differ

diff --git a/gfx/menu/wickedx/scrollbar_c.tga b/gfx/menu/wickedx/scrollbar_c.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_c.tga differ

diff --git a/gfx/menu/wickedx/scrollbar_f.tga b/gfx/menu/wickedx/scrollbar_f.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_f.tga differ

diff --git a/gfx/menu/wickedx/scrollbar_n.tga b/gfx/menu/wickedx/scrollbar_n.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_n.tga differ

diff --git a/gfx/menu/wickedx/scrollbar_s.tga b/gfx/menu/wickedx/scrollbar_s.tga
new file mode 100644 (file)
index 0000000..c7d4700
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_s.tga differ

diff --git a/gfx/menu/wickedx/skinpreview.jpg b/gfx/menu/wickedx/skinpreview.jpg
new file mode 100755 (executable)
index 0000000..9b8e393
Binary files /dev/null and b/gfx/menu/wickedx/skinpreview.jpg differ

diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
new file mode 100755 (executable)
index 0000000..f91a8f2
--- /dev/null
+++ b/gfx/menu/wickedx/skinvalues.txt
@@ -0,0 +1,224 @@
+title WickedX
+author sev
+
+// Colors: 'Red Green Blue'
+// Suffixes: Clicked (_c), Disabled (_d), Focused (_f), Normal (_n)
+
+// Background layer scaling:
+//   Crop (c), Letterbox (l), Height (h), Width (w), Stretch (s)
+// Background layer positioning:
+//   Top Left (7), Top Center (8) Top Right (9)
+//   Middle Left (4), Middle Center (5) Middle Right (6)
+//   Bottom Left (1), Bottom Center (2) Bottom Right (3)
+// ALIGN_BACKGROUND(_INGAME) spspsp, s=Scale p=Position
+
+//------------------------------------------------------------------------------
+// Structure (e.g. positions, sizes, margins)
+//------------------------------------------------------------------------------
+// item: color picker
+//   uses "colorpicker" images
+MARGIN_COLORPICKER              '0 0 0'
+
+// item: dialog
+//   uses "border" images
+//   uses "closebutton" images
+MARGIN_TOP                      8
+MARGIN_BOTTOM                   8
+MARGIN_LEFT                     8
+MARGIN_RIGHT                    8
+MARGIN_COLUMNS                  4
+MARGIN_ROWS                     4
+HEIGHT_DIALOGBORDER             1
+
+// font sizes (used for everything)
+FONTSIZE_NORMAL                 12
+HEIGHT_NORMAL                   1.5
+FONTSIZE_TITLE                  16
+HEIGHT_TITLE                    1.5
+HEIGHT_ZOOMEDTITLE              -1
+
+// general 
+//   uses "background" images
+//   uses "background_ingame" images
+ALIGN_BACKGROUND                h5h5
+ALIGN_BACKGROUND_INGAME         h5
+ALPHA_BACKGROUND_INGAME         1
+ALPHA_DISABLED                  0.2
+ALPHA_BEHIND                    0.5
+ALPHA_TEXT                      0.7
+
+// mouse
+//   uses "cursor" images
+SIZE_CURSOR                     '32 32 0'
+OFFSET_CURSOR                   '0 0 0'
+ALPHA_CURSOR_INTRO              0
+
+// nexposee positions of windows (they are the scale transformation
+// centers, NOT the actual positions of the windows!)
+POSITION_DIALOG_MULTIPLAYER     '0.8 0.4 0'
+POSITION_DIALOG_SINGLEPLAYER    '0.2 0.4 0'
+POSITION_DIALOG_SETTINGS        '0.5 0.95 0'
+POSITION_DIALOG_CREDITS         '-0.05 1.2 0'
+POSITION_DIALOG_QUIT            '1.05 1.2 0'
+
+// tooltips
+//   uses "tooltip" images
+MARGIN_TOOLTIP                  '8 8 0'
+BORDER_TOOLTIP                  '16 16 0'
+FONTSIZE_TOOLTIP                12
+ALPHA_TOOLTIP                   0.7
+WIDTH_TOOLTIP                   0.3
+AVOID_TOOLTIP                   '8 8 0'
+
+//------------------------------------------------------------------------------
+// Colors (e.g. font colors, field colors)
+//------------------------------------------------------------------------------
+// item: campaign
+ALPHA_CAMPAIGN_SELECTABLE       0.8
+COLOR_CAMPAIGN_SELECTABLE       '1 1 1'
+ALPHA_CAMPAIGN_CURRENT          1
+COLOR_CAMPAIGN_CURRENT          '1 1 1'
+ALPHA_CAMPAIGN_FUTURE           0.2
+COLOR_CAMPAIGN_FUTURE           '1 1 1'
+ALPHA_CAMPAIGN_DESCRIPTION      0.7
+
+// item: credits list
+COLOR_CREDITS_TITLE             '0.875 0.375 0'
+ALPHA_CREDITS_TITLE             1
+COLOR_CREDITS_FUNCTION          '0 0.1875 0.4375'
+ALPHA_CREDITS_FUNCTION          0.5
+COLOR_CREDITS_PERSON            '0 0.375 0.75'
+ALPHA_CREDITS_PERSON            0.875
+ROWS_CREDITS                    20
+WIDTH_CREDITS                   0.5
+
+// item: cvar list
+ALPHA_CVARLIST_SAVED            1
+ALPHA_CVARLIST_TEMPORARY        0.7    
+COLOR_CVARLIST_CHANGED          '0 0.375 0.75' 
+COLOR_CVARLIST_REVERTBUTTON     '1 0 0'
+COLOR_CVARLIST_UNCHANGED        '1 1 1'
+
+// item: list box
+COLOR_LISTBOX_SELECTED          '0.875 0.375 0'
+ALPHA_LISTBOX_SELECTED          1
+COLOR_LISTBOX_WAITING           '1 1 1'
+ALPHA_LISTBOX_WAITING           0.5
+
+// item: map list
+COLOR_MAPLIST_TITLE             '1 1 1'
+COLOR_MAPLIST_AUTHOR            '0 0.375 0.75'
+COLOR_MAPLIST_INCLUDEDBG        '0 0.1875 0.4375'
+ALPHA_MAPLIST_INCLUDEDFG        1
+ALPHA_MAPLIST_INCLUDEDBG        0.375
+ALPHA_MAPLIST_NOTINCLUDEDFG     0.25
+
+// item: nexposee
+ALPHAS_MAINMENU                 '0.8 0.9 1'
+
+// item: player model
+COLOR_MODELTITLE                '1 1 1'
+ALPHA_MODELTITLE                1
+
+// item: server info
+COLOR_SERVERINFO_NAME           '1 1 1'
+COLOR_SERVERINFO_IP             '0.875 0.375 0'
+
+// item: server list
+ALPHA_SERVERLIST_FULL           0.4
+ALPHA_SERVERLIST_EMPTY          0.7
+COLOR_SERVERLIST_LOWPING        '0 1 0'
+COLOR_SERVERLIST_MEDPING        '1 0.75 0'
+COLOR_SERVERLIST_HIGHPING       '1 0 0'
+ALPHA_SERVERLIST_HIGHPING       0.4
+ALPHA_SERVERLIST_FAVORITE       0.8
+COLOR_SERVERLIST_FAVORITE       '1 1 1'
+
+// item: skin list
+COLOR_SKINLIST_TITLE            '1 1 1'
+COLOR_SKINLIST_AUTHOR           '0 0.375 0.75'
+
+//------------------------------------------------------------------------------
+// Images (colors multiplied to images)
+//------------------------------------------------------------------------------
+// item: button
+//   uses "button" images
+//   uses "buttongray" images
+//   uses "bigbutton" images
+//   uses "bigbuttongray" images
+COLOR_BUTTON_N                  '1 1 1'
+COLOR_BUTTON_C                  '1 1 1'
+COLOR_BUTTON_F                  '1 1 1'
+COLOR_BUTTON_D                  '1 1 1'
+
+// item: checkbox
+//   uses "checkbox" images
+COLOR_CHECKBOX_N                '1 1 1'
+COLOR_CHECKBOX_C                '0.5 0.75 1'
+COLOR_CHECKBOX_F                '0.5 0.75 1'
+COLOR_CHECKBOX_D                '1 1 1'
+
+// item: crosshair button
+//   uses "crosshairbutton" images
+
+// dialog background colors
+//   uses "border" images
+COLOR_DIALOG_MULTIPLAYER        '1 1 1'
+COLOR_DIALOG_SETTINGS           '1 1 1'
+COLOR_DIALOG_TEAMSELECT         '1 1 1'
+COLOR_DIALOG_QUIT               '1 1 1'
+COLOR_DIALOG_ADVANCED           '1 1 1'
+COLOR_DIALOG_MUTATORS           '1 1 1'
+COLOR_DIALOG_MAPINFO            '1 1 1'
+COLOR_DIALOG_USERBIND           '1 1 1'
+COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
+COLOR_DIALOG_CREDITS            '1 1 1'
+COLOR_DIALOG_WEAPONS            '1 1 1'
+COLOR_DIALOG_RADAR              '1 1 1'
+COLOR_DIALOG_SERVERINFO         '1 1 1'
+COLOR_DIALOG_CVARS              '1 0 0'
+
+// item: input box
+//   uses "inputbox" images
+COLOR_INPUTBOX_N                '1 1 1'
+COLOR_INPUTBOX_F                '1 1 1'
+MARGIN_INPUTBOX_CHARS           1
+
+// item: key grabber
+COLOR_KEYGRABBER_TITLES         '1 1 1'
+ALPHA_KEYGRABBER_TITLES         1
+COLOR_KEYGRABBER_KEYS           '1 1 1'
+ALPHA_KEYGRABBER_KEYS           0.7
+
+// item: player color button
+//   uses "colorbutton" images
+//   uses "color" images
+
+// item: player name editor
+//   uses "charmap" images
+//   uses "charmapbutton" images
+
+// item: radio button
+//   uses "radiobutton" images
+COLOR_RADIOBUTTON_N             '1 1 1'
+COLOR_RADIOBUTTON_C             '1 1 1'
+COLOR_RADIOBUTTON_F             '1 1 1'
+COLOR_RADIOBUTTON_D             '1 1 1'
+
+// item: scrollbar
+//   uses "scrollbar" images
+COLOR_SCROLLBAR_N               '1 1 1'
+COLOR_SCROLLBAR_C               '0.5 0.75 1'
+COLOR_SCROLLBAR_F               '0.5 0.75 1'
+COLOR_SCROLLBAR_S               '0.25 0.25 0.25'
+WIDTH_SCROLLBAR                 16
+
+// item: slider
+//   uses "slider" images
+COLOR_SLIDER_N                  '1 1 1'
+COLOR_SLIDER_C                  '0.5 0.75 1'
+COLOR_SLIDER_F                  '0.5 0.75 1'
+COLOR_SLIDER_D                  '1 1 1'
+COLOR_SLIDER_S                  '0.25 0.25 0.25'
+WIDTH_SLIDERTEXT                0.333333333333
+TOLERANCE_SLIDER                '0.2 2 0'

diff --git a/gfx/menu/wickedx/slider_c.tga b/gfx/menu/wickedx/slider_c.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_c.tga differ

diff --git a/gfx/menu/wickedx/slider_d.tga b/gfx/menu/wickedx/slider_d.tga
new file mode 100644 (file)
index 0000000..87ccbe5
Binary files /dev/null and b/gfx/menu/wickedx/slider_d.tga differ

diff --git a/gfx/menu/wickedx/slider_f.tga b/gfx/menu/wickedx/slider_f.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_f.tga differ

diff --git a/gfx/menu/wickedx/slider_n.tga b/gfx/menu/wickedx/slider_n.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_n.tga differ

diff --git a/gfx/menu/wickedx/slider_s.tga b/gfx/menu/wickedx/slider_s.tga
new file mode 100644 (file)
index 0000000..954c90c
Binary files /dev/null and b/gfx/menu/wickedx/slider_s.tga differ

diff --git a/gfx/menu/wickedx/tooltip.tga b/gfx/menu/wickedx/tooltip.tga
new file mode 100644 (file)
index 0000000..1dc5679
Binary files /dev/null and b/gfx/menu/wickedx/tooltip.tga differ

diff --git a/models/ctf/flag_blue.md3 b/models/ctf/flag_blue.md3
index 16e21962e5b298d5cce54e38968e5e3874f7520d..fc500023adb8443ff8d5d7fb2dc6b3bbcaf175f9 100644 (file)
Binary files a/models/ctf/flag_blue.md3 and b/models/ctf/flag_blue.md3 differ

diff --git a/models/ctf/flag_red.md3 b/models/ctf/flag_red.md3
index d25a466eb2df95590a0114f436fe726cac98d7b5..aa9a75f24dca7970742f7d47582b9dd298a7b08e 100644 (file)
Binary files a/models/ctf/flag_red.md3 and b/models/ctf/flag_red.md3 differ

diff --git a/models/ctf/flags.md3_0.skin b/models/ctf/flags.md3_0.skin
index 9eb6b7fab2b391f3b255d6b70e9ff21524879ea1..05a4fe72fc5955dfe55a03b29dd5ce6cc0d44b85 100644 (file)
--- a/models/ctf/flags.md3_0.skin
+++ b/models/ctf/flags.md3_0.skin
@@ -1,3 +1,3 @@
-flag,textures/flags/flag_red
-flag_cloth,textures/flags/flag_red_cloth
-flag_laser,textures/flags/flag_red_laser
+flag,flags/flag_red
+flag_cloth,flags/flag_red_cloth
+flag_laser,flags/flag_red_laser

diff --git a/models/ctf/flags.md3_1.skin b/models/ctf/flags.md3_1.skin
index a24f1bbabe98e060944cca79aef27a31b65a4e3f..02f217f36abf28de8af0c36f6d5dab9ec9e60360 100644 (file)
--- a/models/ctf/flags.md3_1.skin
+++ b/models/ctf/flags.md3_1.skin
@@ -1,3 +1,3 @@
-flag,textures/flags/flag_blue
-flag_cloth,textures/flags/flag_blue_cloth
-flag_laser,textures/flags/flag_blue_laser
+flag,flags/flag_blue
+flag_cloth,flags/flag_blue_cloth
+flag_laser,flags/flag_blue_laser

diff --git a/models/ctf/radiant/flag_blue_radiant.md3 b/models/ctf/radiant/flag_blue_radiant.md3
index b86c2a8c52a9be1d3efd62cae693d9cf3e4bf9e1..9491a2f7931926e33d936ffb2aed8c5ad7c5184b 100644 (file)
Binary files a/models/ctf/radiant/flag_blue_radiant.md3 and b/models/ctf/radiant/flag_blue_radiant.md3 differ

diff --git a/models/ctf/radiant/flag_red_radiant.md3 b/models/ctf/radiant/flag_red_radiant.md3
index 3f45e4998fa4e6b74fc7bb23165dca1815f78928..8a73bb2051b12cab088430ecdf0c38896868a85e 100644 (file)
Binary files a/models/ctf/radiant/flag_red_radiant.md3 and b/models/ctf/radiant/flag_red_radiant.md3 differ

diff --git a/models/domination/dom_blue.md3 b/models/domination/dom_blue.md3
index 6429f48948dcc8f8482395974fe30403740c15b0..8fd6b4fc09c8b7b238a2b5daecafe4c163d1da0f 100644 (file)
Binary files a/models/domination/dom_blue.md3 and b/models/domination/dom_blue.md3 differ

diff --git a/models/domination/dom_pink.md3 b/models/domination/dom_pink.md3
index 7aa01bf395a317cbcf42ce51c1141169b3c2c6b0..d8a9579cdb97bddd28fe37670c81dacfafe44533 100644 (file)
Binary files a/models/domination/dom_pink.md3 and b/models/domination/dom_pink.md3 differ

diff --git a/models/domination/dom_red.md3 b/models/domination/dom_red.md3
index 332b0f239560283f7d079fa66f7278b356c62919..cb68ce4051de2e1e6d415b93a19ad44c2c58b635 100644 (file)
Binary files a/models/domination/dom_red.md3 and b/models/domination/dom_red.md3 differ

diff --git a/models/domination/dom_unclaimed.md3 b/models/domination/dom_unclaimed.md3
index be5aaa9571860d4e8570e3c096b6c2d66cc8029a..efbcf9cf74ba7fd7932192ddbdac2c7d14e81f72 100644 (file)
Binary files a/models/domination/dom_unclaimed.md3 and b/models/domination/dom_unclaimed.md3 differ

diff --git a/models/domination/dom_yellow.md3 b/models/domination/dom_yellow.md3
index b1da0d1b0990a4d8cda307a0bb86a67e675470a9..bb6ff52fe546b0319c61ac7d7ef429599cc55ede 100644 (file)
Binary files a/models/domination/dom_yellow.md3 and b/models/domination/dom_yellow.md3 differ

diff --git a/models/final_rage/gspawn.md3 b/models/final_rage/gspawn.md3
index 7d2f71edd9a330b35fadf86e18826360a07a2fe1..19ccfecfaaa3f061fba1afe17ab15986991f93b4 100644 (file)
Binary files a/models/final_rage/gspawn.md3 and b/models/final_rage/gspawn.md3 differ

diff --git a/models/final_rage/lamp2.md3 b/models/final_rage/lamp2.md3
index 56afa6ded85b5c6cdf6ae04f960ae10c97069efa..a0688d79abb44bc6c5270ada5e70843340bb1587 100644 (file)
Binary files a/models/final_rage/lamp2.md3 and b/models/final_rage/lamp2.md3 differ

diff --git a/models/final_rage/pspawn1.md3 b/models/final_rage/pspawn1.md3
index eb588be7fd0e8cd7325ba80a416b7dc243eba80d..8c91a309a27fe29cf3c0a95a566447c6042fd9c5 100644 (file)
Binary files a/models/final_rage/pspawn1.md3 and b/models/final_rage/pspawn1.md3 differ

diff --git a/models/gibs/arm.md3 b/models/gibs/arm.md3
index 0e2935f136d027f7f09b124795517fe1b3493f11..69998c145e02b2c8339c248ee963ad2d602f4936 100644 (file)
Binary files a/models/gibs/arm.md3 and b/models/gibs/arm.md3 differ

diff --git a/models/gibs/arm.md3_0.skin b/models/gibs/arm.md3_0.skin
index cfa59b5ea27c2c538abc8a1288c85c0a073eb54c..1e590ac9012dd68276d359b8d3184abcd1de1d2c 100644 (file)
--- a/models/gibs/arm.md3_0.skin
+++ b/models/gibs/arm.md3_0.skin
@@ -1,2 +1,2 @@
-Box03,textures/meat.tga
-Cylinder11,textures/meat.tga
\ No newline at end of file
+Box03,meat
+Cylinder11,meat
\ No newline at end of file

diff --git a/models/gibs/arm.md3_1.skin b/models/gibs/arm.md3_1.skin
index f7ab64a8924bcc47154177851474681997b144fd..dd64aeff76126589f0cc8ea2445d1ac31aa46022 100644 (file)
--- a/models/gibs/arm.md3_1.skin
+++ b/models/gibs/arm.md3_1.skin
@@ -1,2 +1,2 @@
-Box03,textures/meat_robot.tga
-Cylinder11,textures/meat_robot.tga
\ No newline at end of file
+Box03,meat_robot
+Cylinder11,meat_robot
\ No newline at end of file

diff --git a/models/gibs/arm.md3_2.skin b/models/gibs/arm.md3_2.skin
index c5c1d4659c85ecfa625d52e1ea4e63075d0bd158..bb7214529b7226ceab4bd72378038ff42971c36c 100644 (file)
--- a/models/gibs/arm.md3_2.skin
+++ b/models/gibs/arm.md3_2.skin
@@ -1,2 +1,2 @@
-Box03,textures/meat_alien.tga
-Cylinder11,textures/meat_alien.tga
\ No newline at end of file
+Box03,meat_alien
+Cylinder11,meat_alien
\ No newline at end of file

diff --git a/models/gibs/bloodyskull.md3 b/models/gibs/bloodyskull.md3
index 8afd7530e69dd2c04143b2952d0804e967b7643e..b0e5250899db8acd5f0e55b2a0682c295391b281 100644 (file)
Binary files a/models/gibs/bloodyskull.md3 and b/models/gibs/bloodyskull.md3 differ

diff --git a/models/gibs/bloodyskull.md3_0.skin b/models/gibs/bloodyskull.md3_0.skin
index 00da92429cdcc2f77753da45acadd3fa7987cf6f..f5dae0963451d3e2f31cfe6a00e7d2924418009c 100644 (file)
--- a/models/gibs/bloodyskull.md3_0.skin
+++ b/models/gibs/bloodyskull.md3_0.skin
@@ -1 +1 @@
-Box03,textures/bloodyskull.tga
\ No newline at end of file
+Box03,bloodyskull
\ No newline at end of file

diff --git a/models/gibs/bloodyskull.md3_1.skin b/models/gibs/bloodyskull.md3_1.skin
index f3bf1a692afe127216143a59dad9f6d3b0fb8c33..73f5c26d223e0b322887bf1ef4b815586a9744dd 100644 (file)
--- a/models/gibs/bloodyskull.md3_1.skin
+++ b/models/gibs/bloodyskull.md3_1.skin
@@ -1 +1 @@
-Box03,textures/bloodyskull_robot.tga
\ No newline at end of file
+Box03,bloodyskull_robot
\ No newline at end of file

diff --git a/models/gibs/bloodyskull.md3_2.skin b/models/gibs/bloodyskull.md3_2.skin
index 5f71d79d7969cc343a2da1810e72d443307d3aba..558041eb81f37c6a4a9dc9cc8f5f928b533249bd 100644 (file)
--- a/models/gibs/bloodyskull.md3_2.skin
+++ b/models/gibs/bloodyskull.md3_2.skin
@@ -1 +1 @@
-Box03,textures/bloodyskull_alien.tga
\ No newline at end of file
+Box03,bloodyskull_alien
\ No newline at end of file

diff --git a/models/gibs/chest.md3 b/models/gibs/chest.md3
index c7b2510caaa43302864df53e28c31b4774f3bad9..df551b46cc50f61fcb51ea2f93bb8b5058c38db7 100644 (file)
Binary files a/models/gibs/chest.md3 and b/models/gibs/chest.md3 differ

diff --git a/models/gibs/chest.md3_0.skin b/models/gibs/chest.md3_0.skin
index e18c6ad5b0a7f758b3441b0cc66a0f92aaeee236..2e4720a65c72399c6bb559c517c0c34c64d583c2 100644 (file)
--- a/models/gibs/chest.md3_0.skin
+++ b/models/gibs/chest.md3_0.skin
@@ -1,2 +1,2 @@
-Box02,textures/meat.tga
-Cylinder06,textures/meat.tga
\ No newline at end of file
+Box02,meat
+Cylinder06,meat
\ No newline at end of file

diff --git a/models/gibs/chest.md3_1.skin b/models/gibs/chest.md3_1.skin
index af533063d404071d74e94eb1a7643615d9553767..b3844e5ec0ad67055513c8165d703f46f9a6d2ef 100644 (file)
--- a/models/gibs/chest.md3_1.skin
+++ b/models/gibs/chest.md3_1.skin
@@ -1,2 +1,2 @@
-Box02,textures/meat_robot.tga
-Cylinder06,textures/meat_robot.tga
\ No newline at end of file
+Box02,meat_robot
+Cylinder06,meat_robot
\ No newline at end of file

diff --git a/models/gibs/chest.md3_2.skin b/models/gibs/chest.md3_2.skin
index 3ed29a8e57dd45564a48bb11a6cd03fe885fb24b..4e84e5f919e63e13754dcc878d049b2f7e8f10b7 100644 (file)
--- a/models/gibs/chest.md3_2.skin
+++ b/models/gibs/chest.md3_2.skin
@@ -1,2 +1,2 @@
-Box02,textures/meat_alien.tga
-Cylinder06,textures/meat_alien.tga
\ No newline at end of file
+Box02,meat_alien
+Cylinder06,meat_alien
\ No newline at end of file

diff --git a/models/gibs/eye.md3 b/models/gibs/eye.md3
index 211e65a8a0d69638bd531016904281929b2fda33..696d3aae83c4f0cd7b56f085788d6965743c6e8d 100644 (file)
Binary files a/models/gibs/eye.md3 and b/models/gibs/eye.md3 differ

diff --git a/models/gibs/gib1.md3 b/models/gibs/gib1.md3
index 57de2f02b3495950ba4fb55249c954ea957d8dd5..276982da529df03fda8ba79f7ec29e6f68a3fec5 100644 (file)
Binary files a/models/gibs/gib1.md3 and b/models/gibs/gib1.md3 differ

diff --git a/models/gibs/gib2.md3 b/models/gibs/gib2.md3
index 4b29988749315568a58c1e02e6f8e86926574074..f5a2f736206ae88382e965f1ac3c041a7f6f22f4 100644 (file)
Binary files a/models/gibs/gib2.md3 and b/models/gibs/gib2.md3 differ

diff --git a/models/gibs/gib3.md3 b/models/gibs/gib3.md3
index 99cf0e006e3bfa735405d1bb90fb0893ca6e45f4..8a38b42cb821d253fef00fd078afb6752ddd6f87 100644 (file)
Binary files a/models/gibs/gib3.md3 and b/models/gibs/gib3.md3 differ

diff --git a/models/gibs/gib4.md3 b/models/gibs/gib4.md3
index b7588a2c9410cce02c74dfe5476d6e1784421749..dd4c5b53d2770d6f3f4a03304fdad0b0ba7b14cc 100644 (file)
Binary files a/models/gibs/gib4.md3 and b/models/gibs/gib4.md3 differ

diff --git a/models/gibs/gib5.md3 b/models/gibs/gib5.md3
index eded1ca5cf00eba1f0636c00952025b1de2e6ab8..6a51eb220d9541a859329d7593ead1d4382a0fc4 100644 (file)
Binary files a/models/gibs/gib5.md3 and b/models/gibs/gib5.md3 differ

diff --git a/models/gibs/gib6.md3 b/models/gibs/gib6.md3
index 202877211f84a6a55d32d5a6509e61363b482adc..956c9022bfb5ec4e4ea9fed09b6f92b41c68a90b 100644 (file)
Binary files a/models/gibs/gib6.md3 and b/models/gibs/gib6.md3 differ

diff --git a/models/gibs/leg1.md3 b/models/gibs/leg1.md3
index dcbf177c65e5af9f87bba383d35d6e359e8ce8f8..64ab1578abb1cfad0995cce492ea674138ba7b6b 100644 (file)
Binary files a/models/gibs/leg1.md3 and b/models/gibs/leg1.md3 differ

diff --git a/models/gibs/leg1.md3_0.skin b/models/gibs/leg1.md3_0.skin
index 9cd6940f5d00fa4dda5936ee33d5f4ba53a127f5..50c0f685b1fb458f783253f9d81a290d543c7675 100644 (file)
--- a/models/gibs/leg1.md3_0.skin
+++ b/models/gibs/leg1.md3_0.skin
@@ -1 +1 @@
-legs,textures/meat.tga
\ No newline at end of file
+legs,meat
\ No newline at end of file

diff --git a/models/gibs/leg1.md3_1.skin b/models/gibs/leg1.md3_1.skin
index 52caaeb3f4a3d88bc4661d6de6cfa69dff2d83bd..5e924e611197d0b8ad3bdc84f42acedbfd7b78ac 100644 (file)
--- a/models/gibs/leg1.md3_1.skin
+++ b/models/gibs/leg1.md3_1.skin
@@ -1 +1 @@
-legs,textures/meat_robot.tga
\ No newline at end of file
+legs,meat_robot
\ No newline at end of file

diff --git a/models/gibs/leg1.md3_2.skin b/models/gibs/leg1.md3_2.skin
index a5ccef5b42b6ddbfd9bf49d62495da1ec498b411..0151ecad401d4a478d539db41fad3f248f230be9 100644 (file)
--- a/models/gibs/leg1.md3_2.skin
+++ b/models/gibs/leg1.md3_2.skin
@@ -1 +1 @@
-legs,textures/meat_alien.tga
\ No newline at end of file
+legs,meat_alien
\ No newline at end of file

diff --git a/models/gibs/leg2.md3 b/models/gibs/leg2.md3
index bc2d3d87fca30c56a41c11a0ceb663656b9871e5..1dabb0a73423235b0cd81a04300510bfd6c6c4ed 100644 (file)
Binary files a/models/gibs/leg2.md3 and b/models/gibs/leg2.md3 differ

diff --git a/models/gibs/leg2.md3_0.skin b/models/gibs/leg2.md3_0.skin
index 8b01ac961f31c5c54e76af6368ec3623a3d0fa36..9c6e8a156015ec45f9dc81eb1797daf4b9cc65f5 100644 (file)
--- a/models/gibs/leg2.md3_0.skin
+++ b/models/gibs/leg2.md3_0.skin
@@ -1 +1 @@
-legs01,textures/meat.tga
\ No newline at end of file
+legs01,meat
\ No newline at end of file

diff --git a/models/gibs/leg2.md3_1.skin b/models/gibs/leg2.md3_1.skin
index e1b1d96cb96cda3a86280bcbdc5c450f012791d6..12b61e0c0ea872a3bb53c8eeaa70175411eca045 100644 (file)
--- a/models/gibs/leg2.md3_1.skin
+++ b/models/gibs/leg2.md3_1.skin
@@ -1 +1 @@
-legs01,textures/meat_robot.tga
\ No newline at end of file
+legs01,meat_robot
\ No newline at end of file

diff --git a/models/gibs/leg2.md3_2.skin b/models/gibs/leg2.md3_2.skin
index 7da9ca8da3c3f53d0f41b229fa8d1d7799a77b47..834656196f3c242b2a6fdea82dbf9771132caaa3 100644 (file)
--- a/models/gibs/leg2.md3_2.skin
+++ b/models/gibs/leg2.md3_2.skin
@@ -1 +1 @@
-legs01,textures/meat_alien.tga
\ No newline at end of file
+legs01,meat_alien
\ No newline at end of file

diff --git a/models/gibs/smallchest.md3 b/models/gibs/smallchest.md3
index 8277e5e715e075b26e6b4fd61bc9511adf8f6489..0f9fd958cc3a612e91be1eb063acd7c42053c025 100644 (file)
Binary files a/models/gibs/smallchest.md3 and b/models/gibs/smallchest.md3 differ

diff --git a/models/gibs/smallchest.md3_0.skin b/models/gibs/smallchest.md3_0.skin
index 463569452f217399b0f697926c9345fec4334cae..2bf1544cbe474c1eec62e2f570ef13b62be5f02c 100644 (file)
--- a/models/gibs/smallchest.md3_0.skin
+++ b/models/gibs/smallchest.md3_0.skin
@@ -1,5 +1,5 @@
-Box01,textures/meat.tga
-Cylinder02,textures/meat.tga
-Cylinder13,textures/meat.tga
-Cylinder14,textures/meat.tga
-Cylinder15,textures/meat.tga
\ No newline at end of file
+Box01,meat
+Cylinder02,meat
+Cylinder13,meat
+Cylinder14,meat
+Cylinder15,meat
\ No newline at end of file

diff --git a/models/gibs/smallchest.md3_1.skin b/models/gibs/smallchest.md3_1.skin
index 7dcfc4e9f096fdb59e405ab677c690109d371221..3f333a731b65bdfdd282cd7998ba8219ab92a94b 100644 (file)
--- a/models/gibs/smallchest.md3_1.skin
+++ b/models/gibs/smallchest.md3_1.skin
@@ -1,5 +1,5 @@
-Box01,textures/meat_robot.tga
-Cylinder02,textures/meat_robot.tga
-Cylinder13,textures/meat_robot.tga
-Cylinder14,textures/meat_robot.tga
-Cylinder15,textures/meat_robot.tga
\ No newline at end of file
+Box01,meat_robot
+Cylinder02,meat_robot
+Cylinder13,meat_robot
+Cylinder14,meat_robot
+Cylinder15,meat_robot
\ No newline at end of file

diff --git a/models/gibs/smallchest.md3_2.skin b/models/gibs/smallchest.md3_2.skin
index bd766081cb375804d1f1f46f108a2ad39f0223b3..4c60168a0f48574dad992d6ec596075096d4f963 100644 (file)
--- a/models/gibs/smallchest.md3_2.skin
+++ b/models/gibs/smallchest.md3_2.skin
@@ -1,5 +1,5 @@
-Box01,textures/meat_alien.tga
-Cylinder02,textures/meat_alien.tga
-Cylinder13,textures/meat_alien.tga
-Cylinder14,textures/meat_alien.tga
-Cylinder15,textures/meat_alien.tga
\ No newline at end of file
+Box01,meat_alien
+Cylinder02,meat_alien
+Cylinder13,meat_alien
+Cylinder14,meat_alien
+Cylinder15,meat_alien
\ No newline at end of file

diff --git a/models/grenademodel.md3 b/models/grenademodel.md3
index 822caccb3a35045a8736ef6d188e558d546c8e15..7758e3e0f3e134e34a90504bc862604a393faf88 100644 (file)
Binary files a/models/grenademodel.md3 and b/models/grenademodel.md3 differ

diff --git a/models/hook.md3 b/models/hook.md3
index 9f71c9d364bc7f08bb102844e711c9c6e69f8273..b41a434c5757a93a7b48a9b5f4f9592fe79d36ca 100644 (file)
Binary files a/models/hook.md3 and b/models/hook.md3 differ

diff --git a/models/it/chair.md3 b/models/it/chair.md3
index c8e633d5f8802672893fc4f8744d62b39e50e896..0ae4a68cb01e8bda1387b57ed480f547f6a48cd8 100644 (file)
Binary files a/models/it/chair.md3 and b/models/it/chair.md3 differ

diff --git a/models/it/keyboard.md3 b/models/it/keyboard.md3
index b14123a33d540321ae280008ed956d26afdb095b..9a81bd74e9f0d270d7ba831c6cb926c46509e32f 100644 (file)
Binary files a/models/it/keyboard.md3 and b/models/it/keyboard.md3 differ

diff --git a/models/it/lcd.md3 b/models/it/lcd.md3
index ef6f62d917dc6b8c3c70a39ffee38adf62648e28..6ca3288eb533da9d66710fbc93a5308d8cca4b6f 100644 (file)
Binary files a/models/it/lcd.md3 and b/models/it/lcd.md3 differ

diff --git a/models/it/pc.md3 b/models/it/pc.md3
index 8fb2b8f9b714d35cfc38c9fa2e134dec346c6849..fd69ddd2e1d98ee4a8da05d65dc4e4153a5b6977 100644 (file)
Binary files a/models/it/pc.md3 and b/models/it/pc.md3 differ

diff --git a/models/items/a_cells.md3 b/models/items/a_cells.md3
index 3f15bf0fe4de12c2a2f5a39a517ebff89f420feb..04f6afed4c74eb3e65fdd54bb905bef383797a3f 100644 (file)
Binary files a/models/items/a_cells.md3 and b/models/items/a_cells.md3 differ

diff --git a/models/items/a_shells.md3 b/models/items/a_shells.md3
index 90a561ec1f26f8e5ffb2262e59fb91342e6d93fc..f1be48e97575c19e3bbee374354f5b20b06f50e1 100644 (file)
Binary files a/models/items/a_shells.md3 and b/models/items/a_shells.md3 differ

diff --git a/models/items/g_a1.md3 b/models/items/g_a1.md3
index 830e7f119071074dd45519161f9f2d42d663f1d0..22ed73eae12bb910688be43719332e46e71a91be 100644 (file)
Binary files a/models/items/g_a1.md3 and b/models/items/g_a1.md3 differ

diff --git a/models/items/g_a25.md3 b/models/items/g_a25.md3
index 8f24ee18470f29fa57283c0e3b864a200d063e52..da02dcb9ae328af70d9d3e5e6c496cd21cd1c951 100644 (file)
Binary files a/models/items/g_a25.md3 and b/models/items/g_a25.md3 differ

diff --git a/models/items/g_a50.md3 b/models/items/g_a50.md3
index 42a0757430c07637c81bca2d0e779dc7c5ddd923..7525f10480bcc53b1be79748b4874a27196d123f 100644 (file)
Binary files a/models/items/g_a50.md3 and b/models/items/g_a50.md3 differ

diff --git a/models/items/g_armormedium.md3 b/models/items/g_armormedium.md3
index c1ce8a771113089dfb45460709e24ea7812f7175..203a93641f597a173dd9741a38bc6896b6677a33 100644 (file)
Binary files a/models/items/g_armormedium.md3 and b/models/items/g_armormedium.md3 differ

diff --git a/models/items/g_h1.md3 b/models/items/g_h1.md3
index 095011ef8059263709bce4ab549cbed79e2e68bd..3b6e7e9707e09fc9ac91d920e79f30b201ffcdfd 100644 (file)
Binary files a/models/items/g_h1.md3 and b/models/items/g_h1.md3 differ

diff --git a/models/items/g_h100.md3 b/models/items/g_h100.md3
index 14b035d4c7bf8678295c14823c030cf22b725685..1893bc5387c3550f302a97406a6e985ce7e1431f 100644 (file)
Binary files a/models/items/g_h100.md3 and b/models/items/g_h100.md3 differ

diff --git a/models/items/g_h25.md3 b/models/items/g_h25.md3
index 424935c3b587e2dc7cf1fdd566e3592669095069..09ca47b04f2d5e3c9fd4143d6fded0c8efe83c4a 100644 (file)
Binary files a/models/items/g_h25.md3 and b/models/items/g_h25.md3 differ

diff --git a/models/items/g_h50.md3 b/models/items/g_h50.md3
index 913e270b75072b81726f15958e3687ad2847ef89..9d26a567618d2b1962d622d12e7073c976c1a07a 100644 (file)
Binary files a/models/items/g_h50.md3 and b/models/items/g_h50.md3 differ

diff --git a/models/items/g_invincible.md3 b/models/items/g_invincible.md3
index 57c03ca7c3185427ee1c8509a56799d8e55bfc78..7097ec459f44de5e9d269027f49cb50f5fc04e44 100644 (file)
Binary files a/models/items/g_invincible.md3 and b/models/items/g_invincible.md3 differ

diff --git a/models/items/g_rl.md3 b/models/items/g_rl.md3
index 32cfa0467a231960f7b19877aa6c34536d4adb5b..5a276c67fa8ed38eed165887ac8ac1c61e4f18d6 100644 (file)
Binary files a/models/items/g_rl.md3 and b/models/items/g_rl.md3 differ

diff --git a/models/items/g_strength.md3 b/models/items/g_strength.md3
index e6cdad2c5e265ffb02536adcae9ee5d8a02cd2eb..6159b5ff710257bf7f49b2c044fa3831c5f69883 100644 (file)
Binary files a/models/items/g_strength.md3 and b/models/items/g_strength.md3 differ

diff --git a/models/keyhunt/key.md3 b/models/keyhunt/key.md3
index b41e7d9310123001ba55d331dc0b4ac5f5596979..097c90ce472e4a3d3570c8d9c88da7bce9e3f6ae 100644 (file)
Binary files a/models/keyhunt/key.md3 and b/models/keyhunt/key.md3 differ

diff --git a/models/map/forklift.md3 b/models/map/forklift.md3
index f9a946e05168637d207c5f08c51d8fd0feb599df..7dce9f38564cf5c925e7a286d984f879d5062767 100644 (file)
Binary files a/models/map/forklift.md3 and b/models/map/forklift.md3 differ

diff --git a/models/marker.md3 b/models/marker.md3
index 3451252af2d3a8f3fb5e3496f8a670bd128ff8de..c4d5fec2ec8da910506b6f2231354192d6c33d86 100644 (file)
Binary files a/models/marker.md3 and b/models/marker.md3 differ

diff --git a/models/mtree01.md3 b/models/mtree01.md3
index 2a21e6758bef6af1543995522b3877d807055f9f..2694a3f0657d5b828ee35368aa8f08e8dd8940c6 100644 (file)
Binary files a/models/mtree01.md3 and b/models/mtree01.md3 differ

diff --git a/models/mtree02.md3 b/models/mtree02.md3
index 4beecf2f46ed4c8ad4c6c36a1b5d9a16e8423da9..1732639672c96a67e2804ad37070b2f9c3a16657 100644 (file)
Binary files a/models/mtree02.md3 and b/models/mtree02.md3 differ

diff --git a/models/mtree03.md3 b/models/mtree03.md3
index a66acb6f2177194d34a4f8ab4257ddcb58a97e6d..b3b69e65d80c6154ff757f0ae4ebf73e732332c2 100644 (file)
Binary files a/models/mtree03.md3 and b/models/mtree03.md3 differ

diff --git a/models/nexball/ball.md3 b/models/nexball/ball.md3
index f1a2b058fa63b3d0a319718fad579b995604ad7a..75399efc9957a15e3ec154be595f03375f7a3879 100644 (file)
Binary files a/models/nexball/ball.md3 and b/models/nexball/ball.md3 differ

diff --git a/models/nexflash.md3 b/models/nexflash.md3
index 7fd6d05ebd4fda39f499dfb88e499bc8df1c4920..af4c0fc9b4f65fd09fa9770803f01276e3a58d3e 100644 (file)
Binary files a/models/nexflash.md3 and b/models/nexflash.md3 differ

diff --git a/models/onslaught/controlpoint_icon.md3 b/models/onslaught/controlpoint_icon.md3
index fd047dafd8fa85058c3168b7c8694c410e950a3b..2688dd9e5cbbda9782b94a79be7996bb50aa2180 100644 (file)
Binary files a/models/onslaught/controlpoint_icon.md3 and b/models/onslaught/controlpoint_icon.md3 differ

diff --git a/models/onslaught/controlpoint_icon_dmg1.md3 b/models/onslaught/controlpoint_icon_dmg1.md3
index 1a86f2b8f1afc151dc7b51e6c9cd64b82f74a5ce..6ca1ad34efd83582dc695baa05f9a1a905d661fb 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_dmg1.md3 and b/models/onslaught/controlpoint_icon_dmg1.md3 differ

diff --git a/models/onslaught/controlpoint_icon_dmg2.md3 b/models/onslaught/controlpoint_icon_dmg2.md3
index 3adef9a6a44c32698aa0f7daebe309838eb04e7d..a7ef678686c3519b651b4cff19dc36e46fbbfa1e 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_dmg2.md3 and b/models/onslaught/controlpoint_icon_dmg2.md3 differ

diff --git a/models/onslaught/controlpoint_icon_dmg3.md3 b/models/onslaught/controlpoint_icon_dmg3.md3
index d8c24a74938956b1ec3c421f101f238ecbc27a18..aaa15953515edaf80421b8034043e9cde3417ce2 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_dmg3.md3 and b/models/onslaught/controlpoint_icon_dmg3.md3 differ

diff --git a/models/onslaught/controlpoint_icon_gib1.md3 b/models/onslaught/controlpoint_icon_gib1.md3
index 50a5dea0ada94763d8372509b1cd82c594ac5c65..2904ed9c4ebbf43abb04a4d58f2bccde1b525cc0 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_gib1.md3 and b/models/onslaught/controlpoint_icon_gib1.md3 differ

diff --git a/models/onslaught/controlpoint_icon_gib2.md3 b/models/onslaught/controlpoint_icon_gib2.md3
index b4675babde42c763f1680d0a3fd49856257bc5f7..3d484044fd8ca3ced1b94228552cec138d994c5e 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_gib2.md3 and b/models/onslaught/controlpoint_icon_gib2.md3 differ

diff --git a/models/onslaught/controlpoint_icon_gib4.md3 b/models/onslaught/controlpoint_icon_gib4.md3
index 9407b853aed6a8dff73195b2415986ea8b63c4b7..afae69b032e03f55d170a8f9f111b29d0f4d9b8c 100644 (file)
Binary files a/models/onslaught/controlpoint_icon_gib4.md3 and b/models/onslaught/controlpoint_icon_gib4.md3 differ

diff --git a/models/onslaught/controlpoint_pad.md3 b/models/onslaught/controlpoint_pad.md3
index 4f6ee3d5f6253cb666ed89e661df41ac87c992e2..eb814e93901a9bba5d462f3ea47002a83ac47748 100644 (file)
Binary files a/models/onslaught/controlpoint_pad.md3 and b/models/onslaught/controlpoint_pad.md3 differ

diff --git a/models/onslaught/controlpoint_pad2.md3 b/models/onslaught/controlpoint_pad2.md3
index 24d68942b47afd290d481321abeeec96826baeb5..6cff091066ce024e3472b628e5e7b52d8f35e006 100644 (file)
Binary files a/models/onslaught/controlpoint_pad2.md3 and b/models/onslaught/controlpoint_pad2.md3 differ

diff --git a/models/onslaught/gen_gib1.md3 b/models/onslaught/gen_gib1.md3
index 78320c31b9d862bd385bfc198668339c4804b218..cbf7418cd04f9fc965d34c2b3f5d24c3a03bb0ce 100644 (file)
Binary files a/models/onslaught/gen_gib1.md3 and b/models/onslaught/gen_gib1.md3 differ

diff --git a/models/onslaught/gen_gib2.md3 b/models/onslaught/gen_gib2.md3
index 313d5ef2ee5e260c4ebc49380860c385ba13aa88..b8e4ceb5277a17fbf86e6513c7dd45a912abce71 100644 (file)
Binary files a/models/onslaught/gen_gib2.md3 and b/models/onslaught/gen_gib2.md3 differ

diff --git a/models/onslaught/gen_gib3.md3 b/models/onslaught/gen_gib3.md3
index 825a33bd7e668c7a3ccc3fb6df3aa7ed8789293f..c8d46f149524c47acfa8f4bdf646a07266f08af4 100644 (file)
Binary files a/models/onslaught/gen_gib3.md3 and b/models/onslaught/gen_gib3.md3 differ

diff --git a/models/onslaught/generator.md3 b/models/onslaught/generator.md3
index 4bdd5fb85ecffdebe5c44063e4f1a93928692db6..d0c49b9e3a3cbd03917f240895040bc74471414d 100644 (file)
Binary files a/models/onslaught/generator.md3 and b/models/onslaught/generator.md3 differ

diff --git a/models/onslaught/generator_dead.md3 b/models/onslaught/generator_dead.md3
index 24eac48b95bd69660914ce8eec14bc8e4e3b3439..aa07c91c6fd22d8505a4a579737d55e9174c975e 100644 (file)
Binary files a/models/onslaught/generator_dead.md3 and b/models/onslaught/generator_dead.md3 differ

diff --git a/models/onslaught/generator_dmg1.md3 b/models/onslaught/generator_dmg1.md3
index e57df81be4b7929ec3a1281a11f57d961f89facd..7fb818b57a011c30e2a23618a7c5b35130e8f65b 100644 (file)
Binary files a/models/onslaught/generator_dmg1.md3 and b/models/onslaught/generator_dmg1.md3 differ

diff --git a/models/onslaught/generator_dmg2.md3 b/models/onslaught/generator_dmg2.md3
index d5d9107cf552258c779d49f6bf57ba8fa31e3d6d..12f2bb1b95c203f498789e853bfb6fb0ddae91a9 100644 (file)
Binary files a/models/onslaught/generator_dmg2.md3 and b/models/onslaught/generator_dmg2.md3 differ

diff --git a/models/onslaught/generator_dmg3.md3 b/models/onslaught/generator_dmg3.md3
index a44963b78b227fcfdc8aeee2797f1e4565bc1d66..abca4fa0a251ee7b2b5984c08b42638021f2d008 100644 (file)
Binary files a/models/onslaught/generator_dmg3.md3 and b/models/onslaught/generator_dmg3.md3 differ

diff --git a/models/onslaught/generator_dmg4.md3 b/models/onslaught/generator_dmg4.md3
index 8b95b3b75f23d0b55a92f9a6e0a0db51b4bf882e..611a2d4822b31c14011b0e735fb4020216797f3a 100644 (file)
Binary files a/models/onslaught/generator_dmg4.md3 and b/models/onslaught/generator_dmg4.md3 differ

diff --git a/models/onslaught/generator_dmg5.md3 b/models/onslaught/generator_dmg5.md3
index 744bf15df97b95153e456d5eff2a2eaafd4d6b2b..fbb8e87e609a8529d8237e187c9e7fac7a2ccc5c 100644 (file)
Binary files a/models/onslaught/generator_dmg5.md3 and b/models/onslaught/generator_dmg5.md3 differ

diff --git a/models/onslaught/generator_dmg6.md3 b/models/onslaught/generator_dmg6.md3
index b56ad911c6ff95a71faa71b4fdd90aae95cc42fb..a7103cdb3a8b52b0a0dc7197b5050a7c272c4584 100644 (file)
Binary files a/models/onslaught/generator_dmg6.md3 and b/models/onslaught/generator_dmg6.md3 differ

diff --git a/models/onslaught/generator_dmg7.md3 b/models/onslaught/generator_dmg7.md3
index 328e59595579c899714dca98a1921409ca8d3673..b2d6033744baf2a9278b2045f919b4ce3fd7043f 100644 (file)
Binary files a/models/onslaught/generator_dmg7.md3 and b/models/onslaught/generator_dmg7.md3 differ

diff --git a/models/onslaught/generator_dmg8.md3 b/models/onslaught/generator_dmg8.md3
index 453db5f0b91c5897f991049dccf9ed50869b665c..ee941cda4314d051ab676dc9eea79b319cede475 100644 (file)
Binary files a/models/onslaught/generator_dmg8.md3 and b/models/onslaught/generator_dmg8.md3 differ

diff --git a/models/onslaught/generator_dmg9.md3 b/models/onslaught/generator_dmg9.md3
index d1b64a9fd3adfaf70e3f0e1f0231e30304fabd9d..03b6768d2db96a4a2a68990fc978b0b9e0b9aa15 100644 (file)
Binary files a/models/onslaught/generator_dmg9.md3 and b/models/onslaught/generator_dmg9.md3 differ

diff --git a/models/player/carni.tga b/models/player/carni.tga
deleted file mode 100644 (file)
index 8794d66..0000000
Binary files a/models/player/carni.tga and /dev/null differ

diff --git a/models/player/carni.txt b/models/player/carni.txt
deleted file mode 100644 (file)
index d6d082c..0000000
--- a/models/player/carni.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Carni
-models/player/carni
-0
-models/player/carni.zym
-species alien
-
-Mutated Warrior
-
-Sex: Male
-Weight: 107 kg
\ No newline at end of file

diff --git a/models/player/carni.zym b/models/player/carni.zym
deleted file mode 100644 (file)
index 0c2a9e5..0000000
Binary files a/models/player/carni.zym and /dev/null differ

diff --git a/models/player/carni.zym.sounds b/models/player/carni.zym.sounds
deleted file mode 100644 (file)
index b691675..0000000
--- a/models/player/carni.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/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/carni-lycan/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/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/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0

diff --git a/models/player/carni.zym_0.skin b/models/player/carni.zym_0.skin
deleted file mode 100644 (file)
index f8bfcf9..0000000
--- a/models/player/carni.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carni
\ No newline at end of file

diff --git a/models/player/carni.zym_1.skin b/models/player/carni.zym_1.skin
deleted file mode 100644 (file)
index 768b201..0000000
--- a/models/player/carni.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carniarmor

diff --git a/models/player/carni_lod1.zym b/models/player/carni_lod1.zym
deleted file mode 100644 (file)
index 60e44e5..0000000
Binary files a/models/player/carni_lod1.zym and /dev/null differ

diff --git a/models/player/carni_lod1.zym_0.skin b/models/player/carni_lod1.zym_0.skin
deleted file mode 100644 (file)
index f8bfcf9..0000000
--- a/models/player/carni_lod1.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carni
\ No newline at end of file

diff --git a/models/player/carni_lod1.zym_1.skin b/models/player/carni_lod1.zym_1.skin
deleted file mode 100644 (file)
index 768b201..0000000
--- a/models/player/carni_lod1.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carniarmor

diff --git a/models/player/carni_lod2.zym b/models/player/carni_lod2.zym
deleted file mode 100644 (file)
index 4c85820..0000000
Binary files a/models/player/carni_lod2.zym and /dev/null differ

diff --git a/models/player/carni_lod2.zym_0.skin b/models/player/carni_lod2.zym_0.skin
deleted file mode 100644 (file)
index f8bfcf9..0000000
--- a/models/player/carni_lod2.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carni
\ No newline at end of file

diff --git a/models/player/carni_lod2.zym_1.skin b/models/player/carni_lod2.zym_1.skin
deleted file mode 100644 (file)
index 768b201..0000000
--- a/models/player/carni_lod2.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-carni2,carniarmor

diff --git a/models/player/carniarmor.tga b/models/player/carniarmor.tga
deleted file mode 100644 (file)
index 0d4d317..0000000
Binary files a/models/player/carniarmor.tga and /dev/null differ

diff --git a/models/player/carniarmor.txt b/models/player/carniarmor.txt
deleted file mode 100644 (file)
index 8adb0c7..0000000
--- a/models/player/carniarmor.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Armored Carni
-models/player/carniarmor
-1
-models/player/carni.zym
-species alien
-
-Mutated Warrior
-
-Sex: Male
-Weight: 107 kg
-Age: 15
\ No newline at end of file

diff --git a/models/player/crash.zym b/models/player/crash.zym
deleted file mode 100644 (file)
index 8196089..0000000
Binary files a/models/player/crash.zym and /dev/null differ

diff --git a/models/player/crash.zym.sounds b/models/player/crash.zym.sounds
deleted file mode 100644 (file)
index dd7be39..0000000
--- a/models/player/crash.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/soldier/coms/attackinfive 0
-coverme sound/player/soldier/coms/coverme 0
-defend sound/player/soldier/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/soldier/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/soldier/coms/incoming 0
-meet sound/player/soldier/coms/meet 0
-needhelp sound/player/soldier/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/soldier/coms/seenflag 0
-taunt sound/player/soldier/coms/taunt 3
-teamshoot sound/player/soldier/coms/teamshoot 3
-death sound/player/soldier/player/death 3
-drown sound/player/soldier/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/soldier/player/falling 0
-gasp sound/player/soldier/player/gasp 0
-jump sound/player/soldier/player/jump 0
-pain25 sound/player/soldier/player/pain25 0
-pain50 sound/player/soldier/player/pain50 0
-pain75 sound/player/soldier/player/pain75 0
-pain100 sound/player/soldier/player/pain100 0

diff --git a/models/player/crash.zym_0.skin b/models/player/crash.zym_0.skin
deleted file mode 100644 (file)
index ca24bfe..0000000
--- a/models/player/crash.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-mechanical12,quark

diff --git a/models/player/crash_lod1.zym b/models/player/crash_lod1.zym
deleted file mode 100644 (file)
index e722d19..0000000
Binary files a/models/player/crash_lod1.zym and /dev/null differ

diff --git a/models/player/crash_lod1.zym_0.skin b/models/player/crash_lod1.zym_0.skin
deleted file mode 100644 (file)
index ca24bfe..0000000
--- a/models/player/crash_lod1.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-mechanical12,quark

diff --git a/models/player/crash_lod2.zym b/models/player/crash_lod2.zym
deleted file mode 100644 (file)
index 86b1fa3..0000000
Binary files a/models/player/crash_lod2.zym and /dev/null differ

diff --git a/models/player/crash_lod2.zym_0.skin b/models/player/crash_lod2.zym_0.skin
deleted file mode 100644 (file)
index ca24bfe..0000000
--- a/models/player/crash_lod2.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-mechanical12,quark

diff --git a/models/player/fricka.tga b/models/player/fricka.tga
deleted file mode 100644 (file)
index 1dc5b02..0000000
Binary files a/models/player/fricka.tga and /dev/null differ

diff --git