]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
73 files changed:
balance.cfg
defaultXonotic.cfg
loadfonts.cfg [deleted file]
models/player/erebus.iqm
models/player/erebus.iqm_0.tga
models/player/gak.iqm
models/player/gak.iqm_0.tga
models/player/gakarmored.iqm
models/player/gakarmored.iqm_0.tga
models/player/gakmasked.iqm
models/player/gakmasked.iqm_0.tga
models/player/ignis.iqm
models/player/ignis.iqm_0.tga
models/player/ignishalfmasked.iqm
models/player/ignishalfmasked.iqm_0.tga
models/player/ignismasked.iqm
models/player/ignismasked.iqm_0.tga
models/player/nyx.iqm
models/player/nyx.iqm_0.tga
models/player/pyria.iqm
models/player/pyria.iqm_0.tga
models/player/seraphina.iqm
models/player/seraphina.iqm_0.tga
models/player/seraphinamasked.iqm
models/player/seraphinamasked.iqm_0.tga
models/player/umbra.iqm
models/player/umbra.iqm_0.tga
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/menu/draw.qc
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/keybinder.c
qcsrc/server/autocvars.qh [new file with mode: 0644]
qcsrc/server/bot/bot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_physics.qc
qcsrc/server/g_tetris.qc
qcsrc/server/progs.src
quake.rc
textures/campingrifle.tga
textures/campingrifle_bump.tga
textures/campingrifle_gloss.tga
textures/electro.tga
textures/electro_gloss.tga
textures/electro_glow.tga
textures/electro_norm.tga
textures/electro_pants.tga
textures/glauncher.tga
textures/glauncher_gloss.tga
textures/glauncher_norm.tga
textures/glauncher_pants.tga
textures/glauncher_shirt.tga
textures/hagar2.tga
textures/hagar2_gloss.tga
textures/hagar2_glow.tga
textures/hagar2_norm.tga
textures/hagar2_pants.tga
textures/hagar2_shirt.tga
textures/hlac_body.tga
textures/hlac_body_gloss.tga
textures/hlac_body_norm.tga
textures/hlac_body_pants.tga
textures/hlac_body_shirt.tga
textures/hookgun.tga
textures/hookgun_gloss.tga
textures/hookgun_norm.tga
textures/hookgun_pants.tga
textures/shotgun2.tga
textures/shotgun2_gloss.tga
textures/shotgun2_glow.tga
textures/shotgun2_norm.tga
textures/shotgun2_shirt.tga
update-cvarcount.sh

index cb58e9a14e563876567ed9accf0ebb85b4e2b5c3..156b69aed586e61776ebd45bc3dc5ee7035f6e99 100644 (file)
@@ -16,21 +16,21 @@ set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always pro
 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 -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_balance_health_start 100
+set g_balance_health_start 150
 set g_balance_armor_start 0
-set g_start_ammo_shells 45
+set g_start_ammo_shells 40
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_fuel 0
-set g_warmup_start_health 200 "starting values when being in warmup-stage"
+set g_warmup_start_health 250 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 200
+set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 50
 set g_lms_start_ammo_nails 150
@@ -54,40 +54,40 @@ set g_balance_nix_ammoincr_fuel 2
 // {{{ pickup items
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 0
-set g_pickup_shells 30
-set g_pickup_shells_max 120
+set g_pickup_shells 15
+set g_pickup_shells_max 999
 set g_pickup_nails 80
-set g_pickup_nails_max 400
-set g_pickup_rockets 30
-set g_pickup_rockets_max 120
-set g_pickup_cells 50
-set g_pickup_cells_max 200
+set g_pickup_nails_max 999
+set g_pickup_rockets 15
+set g_pickup_rockets_max 999
+set g_pickup_cells 25
+set g_pickup_cells_max 999
 set g_pickup_fuel 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
-set g_pickup_armorsmall 10
-set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 999
 set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 100
+set g_pickup_armormedium_max 999
 set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 100
+set g_pickup_armorbig_max 999
 set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 100
+set g_pickup_armorlarge_max 999
 set g_pickup_armorlarge_anyway 0
-set g_pickup_healthsmall 10
-set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 999
 set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_max 999
 set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_max 999
 set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
-set g_pickup_healthmega_max 200
+set g_pickup_healthmega_max 999
 set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
@@ -104,23 +104,23 @@ set g_pickup_respawntimejitter_ammo 0
 // }}}
 
 // {{{ regen/rot
-set g_balance_health_regen 0
-set g_balance_health_regenlinear 5
+set g_balance_health_regen 0.1
+set g_balance_health_regenlinear 0
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0
-set g_balance_health_rotlinear 5
-set g_balance_pause_health_rot 3
-set g_balance_pause_health_rot_spawn 1
+set g_balance_health_rot 0.1
+set g_balance_health_rotlinear 0
+set g_balance_pause_health_rot 5
+set g_balance_pause_health_rot_spawn 10
 set g_balance_health_regenstable 100
 set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
+set g_balance_armor_rot 0.1
 set g_balance_armor_rotlinear 0
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 1
+set g_balance_pause_armor_rot 5
+set g_balance_pause_armor_rot_spawn 10
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 100
 set g_balance_armor_limit 999
@@ -156,8 +156,8 @@ set g_projectiles_newton_style 2
 // 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
 // 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
 // 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.8
-set g_projectiles_newton_style_2_maxfactor 1.5
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
 set g_projectiles_spread_style 0
 // possible values:
 // 0: forward + solid sphere (like Quake) - varies velocity
@@ -188,7 +188,7 @@ set g_balance_powerup_strength_selfforce 1.5
 set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
 set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
 set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
 set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
 set g_jetpack_fuel 8 "fuel per second for jetpack"
 set g_jetpack_attenuation 2 "jetpack sound attenuation"
@@ -206,11 +206,11 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_damage 35
 set g_balance_laser_primary_edgedamage 10
 set g_balance_laser_primary_force 400
 set g_balance_laser_primary_radius 70
-set g_balance_laser_primary_speed 12000
+set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
@@ -219,81 +219,81 @@ set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.03
 set g_balance_laser_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 25
+set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 12000
+set g_balance_laser_secondary_speed 9000
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
-set g_balance_shotgun_primary_damage 8
-set g_balance_shotgun_primary_force 0
-set g_balance_shotgun_primary_spread 0.11
+set g_balance_shotgun_primary_damage 9
+set g_balance_shotgun_primary_force 60
+set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_primary_refire 0.5
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 8000
+set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 8
-set g_balance_shotgun_secondary_force 0
-set g_balance_shotgun_secondary_spread 0.17
+set g_balance_shotgun_secondary_damage 9
+set g_balance_shotgun_secondary_force 60
+set g_balance_shotgun_secondary_spread 0.1
 set g_balance_shotgun_secondary_refire 1.35
 set g_balance_shotgun_secondary_animtime 0.2
 set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 8000
+set g_balance_shotgun_secondary_speed 12000
 set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
 // }}}
 // {{{ uzi
 set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 12
-set g_balance_uzi_first_force 0
+set g_balance_uzi_first_damage 30
+set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.15
+set g_balance_uzi_first_refire 0.2
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 0
+set g_balance_uzi_sustained_damage 15
+set g_balance_uzi_sustained_force 27
 set g_balance_uzi_sustained_spread 0.05
-set g_balance_uzi_sustained_refire 0.075
+set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
 set g_balance_uzi_speed 18000
 set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_damage 50
+set g_balance_grenadelauncher_primary_damage 70
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
 set g_balance_grenadelauncher_primary_radius 140
-set g_balance_grenadelauncher_primary_speed 2200
-set g_balance_grenadelauncher_primary_speed_up 220
+set g_balance_grenadelauncher_primary_speed 2000
+set g_balance_grenadelauncher_primary_speed_up 200
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 30
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 60
+set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
-set g_balance_grenadelauncher_secondary_speed_up 150
+set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 1
+set g_balance_grenadelauncher_secondary_lifetime 2.5
 set g_balance_grenadelauncher_secondary_refire 0.7
 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_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
@@ -320,15 +320,15 @@ set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0
-set g_balance_electro_secondary_lifetime 2.5
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1
-set g_balance_electro_secondary_animtime 0.2
+set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
+set g_balance_electro_secondary_animtime 0.3
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 50
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
 set g_balance_electro_combo_radius 250
@@ -336,12 +336,12 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 2000
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 14
+set g_balance_crylink_primary_damage 18
 set g_balance_crylink_primary_edgedamage 0
 set g_balance_crylink_primary_force -55
 set g_balance_crylink_primary_radius 80
 set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.01
+set g_balance_crylink_primary_spread 0.03
 set g_balance_crylink_primary_shots 4
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.4
@@ -357,17 +357,17 @@ set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 24
 set g_balance_crylink_primary_other_fadetime 0.25
 
 set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 10
+set g_balance_crylink_secondary_damage 18
 set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -40
-set g_balance_crylink_secondary_radius 10
-set g_balance_crylink_secondary_speed 4000
-set g_balance_crylink_secondary_spread 0.01
-set g_balance_crylink_secondary_shots 3
+set g_balance_crylink_secondary_force -55
+set g_balance_crylink_secondary_radius 3
+set g_balance_crylink_secondary_speed 7000
+set g_balance_crylink_secondary_spread 0.08
+set g_balance_crylink_secondary_shots 7
 set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.1
-set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_refire 0.5
+set g_balance_crylink_secondary_animtime 0.3
+set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@ -392,43 +392,43 @@ set g_balance_minstanex_animtime 0.3
 set g_balance_minstanex_ammo 10
 // }}}
 // {{{ hagar
-set g_balance_hagar_primary_damage 30
-set g_balance_hagar_primary_edgedamage 0
-set g_balance_hagar_primary_force 50
-set g_balance_hagar_primary_radius 70
-set g_balance_hagar_primary_spread 0.05
-set g_balance_hagar_primary_speed 2400
+set g_balance_hagar_primary_damage 37
+set g_balance_hagar_primary_edgedamage 15
+set g_balance_hagar_primary_force 100
+set g_balance_hagar_primary_radius 65
+set g_balance_hagar_primary_spread 0.010
+set g_balance_hagar_primary_speed 3000
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 20
-set g_balance_hagar_secondary_edgedamage 10
-set g_balance_hagar_secondary_force 50
-set g_balance_hagar_secondary_radius 90
-set g_balance_hagar_secondary_spread 0.05
-set g_balance_hagar_secondary_speed 2000
-set g_balance_hagar_secondary_lifetime_min 0.1
-set g_balance_hagar_secondary_lifetime_rand 0.05
-set g_balance_hagar_secondary_refire 0.1
-set g_balance_hagar_secondary_ammo 0.5
+set g_balance_hagar_secondary_damage 37
+set g_balance_hagar_secondary_edgedamage 15
+set g_balance_hagar_secondary_force 100
+set g_balance_hagar_secondary_radius 65
+set g_balance_hagar_secondary_spread 0.015
+set g_balance_hagar_secondary_speed 1400
+set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.15
+set g_balance_hagar_secondary_ammo 1
 // }}}
 // {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 80
+set g_balance_rocketlauncher_damage 105
 set g_balance_rocketlauncher_edgedamage 40
 set g_balance_rocketlauncher_force 600
-set g_balance_rocketlauncher_radius 100
-set g_balance_rocketlauncher_speed 1600
-set g_balance_rocketlauncher_speedaccel 1600
-set g_balance_rocketlauncher_speedstart 1000
+set g_balance_rocketlauncher_radius 150
+set g_balance_rocketlauncher_speed 850
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 850
 set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1.2
+set g_balance_rocketlauncher_refire 1
 set g_balance_rocketlauncher_animtime 0.3
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 40
 set g_balance_rocketlauncher_damageforcescale 4
-set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 140 // max degrees per second
+set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 90 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
 set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
@@ -448,12 +448,12 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 // {{{ hook
-set g_balance_hook_primary_fuel 2 // hook monkeys set 0
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
 set g_balance_hook_primary_refire 0 // hook monkeys set 0
 set g_balance_hook_primary_animtime 0.3 // good shoot anim
 set g_balance_hook_primary_hooked_time_max 0 // infinite
 set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 3 // fuel per second hooked
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
 set g_balance_hook_secondary_damage 25 // not much
 set g_balance_hook_secondary_edgedamage 5 // not much
 set g_balance_hook_secondary_radius 500 // LOTS
@@ -570,7 +570,7 @@ set g_balance_fireball_secondary_damageforcescale 4
 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 110
 set g_balance_fireball_secondary_lifetime 7
index 62c60831ebecc4c6b6ec5b4dd2ba6dabc1beefc3..32f5fbc4748331a60ced8a230b92866ce7a3473f 100644 (file)
@@ -1788,9 +1788,6 @@ collision_endposnudge 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
-// FIXME temporary
-set menu_font_size_snapping_fix 1
-
 // player ID
 seta _cl_userid "" "player ID (e.g. for tournaments)"
 
diff --git a/loadfonts.cfg b/loadfonts.cfg
deleted file mode 100644 (file)
index dd3b637..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// When freetype support is in SVN, remove the space between vera-sans and the comma :)
-// like: loadfont user0 gfx/vera-sans,gfx/fallback 8 12 16 24 32
-// loadfont console     gfx/vera-mono,gfx/fallback $con_textsize 9 10 11
-// loadfont sbar        gfx/vera-mono
-loadfont notify      gfx/vera-sans,gfx/fallback 8 12 16 24 32
-loadfont chat        gfx/vera-sans,gfx/fallback 8 13 16 24 32
-// loadfont centerprint gfx/vera-mono
-// loadfont infobar     gfx/vera-mono
-loadfont user0       gfx/vera-sans,gfx/fallback 8 12 16 24 32
-
-// now create the real sbar_font alias
-alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big,gfx/fallback ${2-}; sbar_columns_set"
-// if _requested_sbar_font is empty, the string becaomse "nonempty: "
-// for the case "nonempty: " a default value is used
-// in any other case, the _requested_sbar_font is sued
-set _used_sbar_font "nonempty: $_requested_sbar_font"
-toggle _used_sbar_font "$_requested_sbar_font" "nonempty: " "gfx/vera-sans 8 12 16 24 32"
-toggle _requested_sbar_font "" "gfx/vera-sans 8 12 16 24 32" "gfx/vera-sans 8 12 16 24 32" "$_requested_sbar_font"
-sbar_font ${_requested_sbar_font asis}
-
-set menu_font_size_snapping_fix 1
index 28a3c07cc38032d61ca4ab40da7402bb83263012..ebd112b84aa04b52e7c98f48233aa48a17721677 100644 (file)
Binary files a/models/player/erebus.iqm and b/models/player/erebus.iqm differ
index ee7fb587718aa4fb54d0c621f0cb146e8a03cfd0..4fedf7713d5d990cca362a32750f2ec6add7b622 100644 (file)
Binary files a/models/player/erebus.iqm_0.tga and b/models/player/erebus.iqm_0.tga differ
index 22a1975517fa37fc75ca2449342e5d76ddde5b17..dccf325bcaacae7c8bb1b35ec515235ca5e789a5 100644 (file)
Binary files a/models/player/gak.iqm and b/models/player/gak.iqm differ
index 093b7f061deeb1fd653e17ff1181c5c18fdc119a..38a72739c1e7660414c3022bff8251c6b29ad873 100644 (file)
Binary files a/models/player/gak.iqm_0.tga and b/models/player/gak.iqm_0.tga differ
index 9df6bdb33a8ca2d4e45a264f021469a5711bb1f5..c4b574a074680ee489fe744a8ffe3e818dfaa472 100644 (file)
Binary files a/models/player/gakarmored.iqm and b/models/player/gakarmored.iqm differ
index b4a58ea31b55ff19794a3554e1630f5ee7c1bae2..0fbb375cdddee31738e590554f5e4542e547da7a 100644 (file)
Binary files a/models/player/gakarmored.iqm_0.tga and b/models/player/gakarmored.iqm_0.tga differ
index 275953dff302feae71bc5b3c10ea45fe41ce386b..646c628f86af40a66c99ae2a374169fa2bcfb93d 100644 (file)
Binary files a/models/player/gakmasked.iqm and b/models/player/gakmasked.iqm differ
index 40d2958a7e30e1801e392ab7c18733eca5449323..7b30802fc3c02533b9bdabbd1215d2347a11a0fd 100644 (file)
Binary files a/models/player/gakmasked.iqm_0.tga and b/models/player/gakmasked.iqm_0.tga differ
index cccb00c319317c96f918bc3f5d50da8f88d1fd3c..2e4749346439daa40f72b49fc420cc99d0323c62 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ
index 990538486d3ef5ba43bbb9df4959b71384a3262f..3ad24e0dc1efafb05dcabe885d510cd9129251ca 100644 (file)
Binary files a/models/player/ignis.iqm_0.tga and b/models/player/ignis.iqm_0.tga differ
index 5a823e2424f23877cc8dc872724e57c394f7fe40..7f5a51295eb8284bc33edbc5a0b14c642b528eb1 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ
index c0beb4ac351ee7ede131b44446093b46aec9f2f5..487a131163665f1d890e1d3af118777fc9fb3ad0 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm_0.tga and b/models/player/ignishalfmasked.iqm_0.tga differ
index a165aac0733d91f010b3a5158464fe2c6d75a63b..fbf2b00faedbbadeca6ef20a2a21ff8117bd9abe 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ
index 572e8fe877ace319a222542f568e2c437e332bc4..8a29f813665e85140916b8aac06c27ae7b524540 100644 (file)
Binary files a/models/player/ignismasked.iqm_0.tga and b/models/player/ignismasked.iqm_0.tga differ
index 85cc5f5439f6e1f3538e50e5bf01dc68bdf18c78..505fcb9f198b0c2dbd448fc80cf4706c683b7595 100644 (file)
Binary files a/models/player/nyx.iqm and b/models/player/nyx.iqm differ
index da5cbe7f2b997de2380e20883ce2789882219621..f6bcb017c85aa62378480e80a604e8acd1cd8bc5 100644 (file)
Binary files a/models/player/nyx.iqm_0.tga and b/models/player/nyx.iqm_0.tga differ
index c4e75396f798873099880c6ced57dd3823e091db..ef2ef0509233d5810e965a83ab210f7acecb5e20 100644 (file)
Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ
index b155a57ec7b802501eb6e716b9b59e3ecb388f35..730ade37a7a216429447a3ec98cc40c2f17c8597 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ
index 716bcc072530c9ba20a1f78da0c4a719121880e6..7e6dbc224abbedecddc0d9d2731488d46a289bc8 100644 (file)
Binary files a/models/player/seraphina.iqm and b/models/player/seraphina.iqm differ
index 299f5a37297959123fd90a7ee7ca32a32d66e329..4a0215b832e18a36de870c373795a39d1599c536 100644 (file)
Binary files a/models/player/seraphina.iqm_0.tga and b/models/player/seraphina.iqm_0.tga differ
index 98f29be98ea7bd7f1becd1f0417b2a2329c36a79..f65dce6f0af1d489da71f59d9e25628f79168b16 100644 (file)
Binary files a/models/player/seraphinamasked.iqm and b/models/player/seraphinamasked.iqm differ
index e5a61dbef023e324facee885c33d5acf61be8e8c..7a2dc98c579c09dcb622f3bc6def59ad6d34b010 100644 (file)
Binary files a/models/player/seraphinamasked.iqm_0.tga and b/models/player/seraphinamasked.iqm_0.tga differ
index 2b53ad252d5f8e30fa18530a012b7bcb5dceacc8..f43ad6778e8dd16dfcd72f9e710816a5c81c5710 100644 (file)
Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ
index d3b3cc4c127a70bfbd161d1f011e37522c5ee827..4fb0941c839674ff331e4caa5a10e8d8f6c301f3 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ
index 9a8059e84cd4108cf870bd614f1dbbb0bdbcb621..b457667e3ea70023f486076324f7585b7ce5bee5 100644 (file)
@@ -1402,7 +1402,6 @@ void HUD_WeaponIcons_Clear()
 }
 
 entity weaponorder[WEP_MAXCOUNT];
-
 void weaponorder_swap(float i, float j, entity pass)
 {
        entity h;
@@ -1411,6 +1410,7 @@ void weaponorder_swap(float i, float j, entity pass)
        weaponorder[j] = h;
 }
 
+string weaponorder_cmp_str_save;
 string weaponorder_cmp_str;
 float weaponorder_cmp(float i, float j, entity pass)
 {
@@ -1435,15 +1435,25 @@ void HUD_WeaponIcons(void)
        {
                self = get_weaponinfo(i);
                if(self.impulse >= 0)
-               {
-                       weaponorder[weapon_cnt] = self;
                        ++weapon_cnt;
-               }
        }
 
        // TODO make this configurable
        weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
-       heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
+
+       if(weaponorder_cmp_str != weaponorder_cmp_str_save)
+       {
+               if(weaponorder_cmp_str_save)
+                       strunzone(weaponorder_cmp_str_save);
+               weaponorder_cmp_str_save = strzone(weaponorder_cmp_str);
+               for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+               {
+                       self = get_weaponinfo(i);
+                       if(self.impulse >= 0)
+                               weaponorder[weapon_cnt] = self;
+               }
+               heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
+       }
 
        HUD_Panel_DrawBg(id, pos, mySize, 0);
        float padding;
index 0e3e58f49607542917a34d1ebfa154cd20962e22..74830223d9306f31cead7823a6f3ff590b593e7f 100644 (file)
@@ -510,18 +510,13 @@ void drawstring_expanding(vector position, string text, vector scale, vector rgb
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = sz * '1 1 0';
-       else
-               drawfontscale = '1 1 0';
+       drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
         drawstring(position + expandingbox_resize_centered_box_offset(sz, scale, stringwidth(text, FALSE, scale * (sz / drawfontscale_x)) / (scale_x * sz)), text, scale * (sz / drawfontscale_x), rgb, alpha * (1 - fadelerp), flag);
        // width parameter:
        //    (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
        //    SIZE1
-
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = '1 1 0';
+       drawfontscale = '1 1 0';
 }
 
 void drawcolorcodedstring_expanding(vector position, string text, vector scale, float alpha, float flag, float fadelerp)
@@ -529,15 +524,10 @@ void drawcolorcodedstring_expanding(vector position, string text, vector scale,
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = sz * '1 1 0';
-       else
-               drawfontscale = '1 1 0';
+       drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
        drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, scale, stringwidth(text, TRUE, scale * (sz / drawfontscale_x)) / (scale_x * sz)), text, scale * (sz / drawfontscale_x), alpha * (1 - fadelerp), flag);
-
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = '1 1 0';
+       drawfontscale = '1 1 0';
 }
 
 // this draws the triangles of a model DIRECTLY. Don't expect high performance, really...
index b504022a5174603e6fa0feb0b30c31f8ffce2ada..2cbf3694d6ae842dc96acce63b24221d6d8d1a6c 100644 (file)
@@ -233,19 +233,10 @@ void draw_Text(vector theOrigin, string theText, vector theSize, vector theColor
        vector fs;
        if(theSize_x <= 0 || theSize_y <= 0)
                error("Drawing zero size text?\n");
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               fs = draw_fontscale;
-               draw_fontscale = '1 1 0';
-       }
        if(ICanHasKallerz)
                drawcolorcodedstring(boxToGlobal(theOrigin, draw_shift, draw_scale), theText, globalToBoxSize(boxToGlobalSize(theSize, draw_scale), draw_fontscale), theAlpha * draw_alpha, 0);
        else
                drawstring(boxToGlobal(theOrigin, draw_shift, draw_scale), theText, globalToBoxSize(boxToGlobalSize(theSize, draw_scale), draw_fontscale), theColor, theAlpha * draw_alpha, 0);
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               draw_fontscale = fs;
-       }
 }
 void draw_CenterText(vector theOrigin, string theText, vector theSize, vector theColor, float theAlpha, float ICanHasKallerz)
 {
@@ -261,16 +252,7 @@ float draw_TextWidth(string theText, float ICanHasKallerz, vector SizeThxBye)
        vector v;
        v = '0 0 0';
        //float r;
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               fs = draw_fontscale;
-               draw_fontscale = '1 1 0';
-       }
        v_x = stringwidth(theText, ICanHasKallerz, boxToGlobalSize(SizeThxBye, draw_scale)) / draw_fontscale_x;
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               draw_fontscale = fs;
-       }
        v = globalToBoxSize(v, draw_scale);
        return v_x;
 }
index 00a056fcadc08ec838dd0bb956b96b3efdb36027..df3bd084a5ec4633be91cd4a651b598c9f092974 100644 (file)
@@ -25,20 +25,20 @@ void XonoticInputSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, "Key bindings:"));
        me.TR(me);
-               me.TD(me, me.rows - 2, 3, kb = makeXonoticKeyBinder());
+               me.TD(me, me.rows - 2, 3.3, kb = makeXonoticKeyBinder());
        me.gotoRC(me, me.rows - 1, 0);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticButton("Change key...", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Change key...", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Change;
                        e.onClickEntity = kb;
                        kb.keyGrabButton = e;
-               me.TD(me, 1, 1, e = makeXonoticButton("Edit...", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Edit...", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Edit;
                        e.onClickEntity = kb;
                        kb.userbindEditButton = e;
                        kb.userbindEditDialog = main.userbindEditDialog;
                        main.userbindEditDialog.keybindBox = kb;
-               me.TD(me, 1, 1, e = makeXonoticButton("Clear", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Clear", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Clear;
                        e.onClickEntity = kb;
 
index bb16e0888956ca61d830a2cece4b2a5374cffd63..2eb51755dca6027427873bc4aabe7719fac22f3c 100644 (file)
@@ -297,7 +297,8 @@ void XonoticKeyBinder_drawListBoxItem(entity me, float i, vector absSize, float
                                theAlpha *= SKINALPHA_DISABLED;
        }
 
-       draw_Text(me.realUpperMargin * eY + extraMargin * eX, descr, me.realFontSize, theColor, theAlpha, 0);
+       s = draw_TextShortenToWidth(descr, me.columnFunctionSize, 0, me.realFontSize);
+       draw_Text(me.realUpperMargin * eY + extraMargin * eX, s, me.realFontSize, theColor, theAlpha, 0);
        if(func != "")
        {
                n = tokenize(findkeysforcommand(func)); // uses '...' strings
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
new file mode 100644 (file)
index 0000000..36334b2
--- /dev/null
@@ -0,0 +1,3 @@
+float autocvar_sv_cheats;
+float autocvar_g_bastet;
+var float autocvar_g_movement_highspeed = 1;
index 940782c8239d9538f474405d87d7b21f967dc447..3ef50481dc5eb785e6cf2d60a0d26c47078b9436 100644 (file)
@@ -136,7 +136,8 @@ void bot_setnameandstuff()
                        prio = 1;
                        FOR_EACH_CLIENT(p)
                        {
-                               if(strcat(prefix, s, suffix) == p.netname)
+                               if(clienttype(p) == CLIENTTYPE_BOT)
+                               if(s == p.cleanname)
                                {
                                        prio = 0;
                                        break;
@@ -200,8 +201,6 @@ void bot_setnameandstuff()
        else
                name = bot_name;
 
-       self.cleanname = strzone(name);
-
        // number bots with identical names
        float i;
        i = 0;
@@ -212,7 +211,11 @@ void bot_setnameandstuff()
                                ++i;
        }
        if (i)
-               name = strcat(name, "(", ftos(i), ")");
+               self.netname = self.netname_freeme = strzone(strcat(prefix, name, "(", ftos(i), ")", suffix));
+       else
+               self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
+
+       self.cleanname = strzone(name);
 
        // pick the model and skin
        if(substring(bot_model, -4, 1) != ".")
@@ -220,8 +223,6 @@ void bot_setnameandstuff()
        self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model));
        self.playerskin = self.playerskin_freeme = strzone(bot_skin);
 
-       self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
-
        self.cvar_cl_accuracy_data_share = 1;  // share the bots weapon accuracy data with the world
        self.cvar_cl_accuracy_data_receive = 0;  // don't receive any weapon accuracy data
 };
index 45eab621ea6b83caf327e662ceff0648dc2d09fe..6ef82679444fc021f0e4d53b42bf278333cf9b8f 100644 (file)
@@ -15,7 +15,6 @@ void Drag_MoveDrag(entity from, entity to) { }
 
 .float maycheat;
 float sv_cheats;
-float autocvar_sv_cheats;
 
 #define CHIMPULSE_SPEEDRUN_INIT 30
 #define CHIMPULSE_GIVE_ALL 99
index 3a405c40be8f52fe179c71cb631ec044da90213c..ac6789586793c86387026ffdfbb787d44850cebd 100644 (file)
@@ -641,7 +641,6 @@ void race_send_speedaward_alltimebest(float msg)
 string GetMapname(void);
 float speedaward_lastupdate;
 float speedaward_lastsent;
-var float autocvar_g_movement_highspeed = 1;
 void SV_PlayerPhysics()
 {
        local vector wishvel, wishdir, v;
index 3f14bf3e7ea9eaa12dc459cb2c9e15b36c850494..64226b21b2a3e16d30807a80159fd62a1edab0e5 100644 (file)
@@ -8,7 +8,6 @@ compile with -DTETRIS
 
 #ifdef TETRIS
 
-float autocvar_g_bastet;
 .vector tet_org;
 
 float tet_vs_current_id;
index d1d0d1d3af9677dc9f6470d359a82707ee8f7b9c..c174177b2002cf0251ed6bc05d8762592f7c0b24 100644 (file)
@@ -6,6 +6,7 @@ pre-builtins.qh
 builtins.qh
 extensions.qh
 post-builtins.qh
+autocvars.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
index 2dec76c772bcf12ee1e6e6d2fcbb03bb9f7bae6c..f24b01548edb1ba456d99059d82fb32c05bb0b88 100644 (file)
--- a/quake.rc
+++ b/quake.rc
@@ -9,4 +9,4 @@ exec loadfonts.cfg
 //startdemos
 //play announcer/male/welcome.ogg
 
-//exec font-dejavu.cfg
+exec font-nimbussansl.cfg
index b707d7f583c8975b60a639d0a53be418ff2de2b4..6d719e6bcf91efe4d7d2a8013334d8182ff3a0bf 100644 (file)
Binary files a/textures/campingrifle.tga and b/textures/campingrifle.tga differ
index b319739c930af84fa541b686c6ffbf66a6ece894..28bd453d6d3351d405fd6010033094c11926e7fd 100644 (file)
Binary files a/textures/campingrifle_bump.tga and b/textures/campingrifle_bump.tga differ
index 0e0156ecdae297b4c1fa5687808dbbbf327161e4..7f4b0326dd1399d83b4246ab7c63b0c7c4504f9b 100644 (file)
Binary files a/textures/campingrifle_gloss.tga and b/textures/campingrifle_gloss.tga differ
index d6f1f8b0e024895561fd1bfe065749a252862334..1fe74b161d971d7c2077766f8408139f32be58ef 100644 (file)
Binary files a/textures/electro.tga and b/textures/electro.tga differ
index d5f259281391311595a9c5907502d2b2daa3efa7..d506dcbb0ad164e50b1afa46d1ab82ac5510c5b0 100644 (file)
Binary files a/textures/electro_gloss.tga and b/textures/electro_gloss.tga differ
index 085f0b069d5acabd35f95c06d41997e66eca300c..91736effd5bc035d29967a7d367dd015d55ce784 100644 (file)
Binary files a/textures/electro_glow.tga and b/textures/electro_glow.tga differ
index 54718a6bbda61ffc1e2d8e5d86904889f9d46b90..019abc9ce038b427eda1f71031553806a002b167 100644 (file)
Binary files a/textures/electro_norm.tga and b/textures/electro_norm.tga differ
index 9454d81a532adbc667da3ea1af902bc93cf8eb6c..b8e70848b29e232d91567a59e56ed5f0e6456b77 100644 (file)
Binary files a/textures/electro_pants.tga and b/textures/electro_pants.tga differ
index a68b0fe80c6f362b9f46b2b1e2b897f7b64bcde5..12a331a952ebf5ed2a91430bbda4dc6aa087feba 100644 (file)
Binary files a/textures/glauncher.tga and b/textures/glauncher.tga differ
index 5d9abed0feca9a1df14b2b494fc537c86db360cb..c6add3e6072f7e99e00ccf39f1a3f00d44acafc4 100644 (file)
Binary files a/textures/glauncher_gloss.tga and b/textures/glauncher_gloss.tga differ
index d8131da38accc93b9661593f145857d9a9dcadf3..910eaa1e7210a444e95db474662612e81e922be0 100644 (file)
Binary files a/textures/glauncher_norm.tga and b/textures/glauncher_norm.tga differ
index f750e1d1975f0c6c9717c2271bfa90370de403a9..1f3957e1e2ecc77b4ba4d575d27e0513d7e67ace 100644 (file)
Binary files a/textures/glauncher_pants.tga and b/textures/glauncher_pants.tga differ
index bb8be51b69c5d85895f0b2de9b2a36ffafcd2f49..853e50b69fd29ec75e0c1110324b59d51a3154af 100644 (file)
Binary files a/textures/glauncher_shirt.tga and b/textures/glauncher_shirt.tga differ
index 1a878799d3e8a6d60b8d4993d4a8206ee6b1926a..2b77dd918ec3b9e572f72ff99861a600a79e9f0a 100644 (file)
Binary files a/textures/hagar2.tga and b/textures/hagar2.tga differ
index 7b7d86d6efae3db77af7a864aaad3d51aff6aa29..f4f597a4a004eb04abb677db0e7695048079eb7c 100644 (file)
Binary files a/textures/hagar2_gloss.tga and b/textures/hagar2_gloss.tga differ
index 48f29bf98d86933f061b4a4881ccbae5fc9027ae..9fff206a2252d8dd5b4659f5487a9794384e55bc 100644 (file)
Binary files a/textures/hagar2_glow.tga and b/textures/hagar2_glow.tga differ
index 27178fd4573fb13505881d7bcdd79e3be4337808..145509deb05f62ae567281f98be1f3e55ae36e17 100644 (file)
Binary files a/textures/hagar2_norm.tga and b/textures/hagar2_norm.tga differ
index 44e4bec4fc19a0b15d7917f99b03b4909699cadf..5992dbf962be2b89364f4240b1f6be12857883fc 100644 (file)
Binary files a/textures/hagar2_pants.tga and b/textures/hagar2_pants.tga differ
index b6700dd82639f115ffa0eff132a566087a3669a8..4527f7e31acc1f1fab4ca3dd3f5f61927b114835 100644 (file)
Binary files a/textures/hagar2_shirt.tga and b/textures/hagar2_shirt.tga differ
index 49d17bb4f4c60943f644374cba4989e9f9980f85..c4c6882a20a117012d1f9fd353d361fc01332c1f 100644 (file)
Binary files a/textures/hlac_body.tga and b/textures/hlac_body.tga differ
index b362c1d13c609b011bb386283e976ab2c1581eb5..b1b517bdaeffbcf3b84787b2cd841852d08ed7f8 100644 (file)
Binary files a/textures/hlac_body_gloss.tga and b/textures/hlac_body_gloss.tga differ
index 5387a5d39be149bdd20c7762d33d25d51fe4b600..fb22b9e8363d26a9275756aed2687d79872f1287 100644 (file)
Binary files a/textures/hlac_body_norm.tga and b/textures/hlac_body_norm.tga differ
index b9ff4f1f6718e93da344a2c4b24e32974c5bd68b..32ee034605b015e575aa0cf4e19e796606611e97 100644 (file)
Binary files a/textures/hlac_body_pants.tga and b/textures/hlac_body_pants.tga differ
index 637c977110e5b08ca985d1c6c14c14350d875892..c3bddd150d9ce505f1a8c36003d1e8a6b7b0bc02 100644 (file)
Binary files a/textures/hlac_body_shirt.tga and b/textures/hlac_body_shirt.tga differ
index 5e4f8f291ff2b1d82f6f074baff807fbfcc4477b..aa65f2f555e0e6d97156794ef4941dceb604241c 100644 (file)
Binary files a/textures/hookgun.tga and b/textures/hookgun.tga differ
index ba1b5edcd085c64b098076434d4dde37acc8ba98..484c2c58cb07707c07a077da19129719a98dc306 100644 (file)
Binary files a/textures/hookgun_gloss.tga and b/textures/hookgun_gloss.tga differ
index 33ec9de397625ec5ef35e1ce88ab18a9ae2c365b..625d4771555e829efece1ea15f377370775f1fd5 100644 (file)
Binary files a/textures/hookgun_norm.tga and b/textures/hookgun_norm.tga differ
index 4091e9d6804e88d9c79128dd3d43ae8a1829eac2..327822d4ef625e2b984a4eeafbe187de7cec5b55 100644 (file)
Binary files a/textures/hookgun_pants.tga and b/textures/hookgun_pants.tga differ
index 55e561a10210fcf8ecfff190bfc5ecda746727b0..cdfd47d42719c02312f54dc43b1b672dce1cd2b8 100644 (file)
Binary files a/textures/shotgun2.tga and b/textures/shotgun2.tga differ
index ef85807342a997b9cd34ce7968d666eb26b81e35..78fdd3167b88c5c890947ee51a6823029e689a3a 100644 (file)
Binary files a/textures/shotgun2_gloss.tga and b/textures/shotgun2_gloss.tga differ
index 16f6b002fa361cb51d6ec4c3afa8f991347c4f28..863f3830b5588939a962f1fbccb5c12cb27b74c7 100644 (file)
Binary files a/textures/shotgun2_glow.tga and b/textures/shotgun2_glow.tga differ
index cff6611f339e874526bcc3a3005442d2f0fc132f..100b3a4ac83f53919cd32de9ba134a7d2ab319db 100644 (file)
Binary files a/textures/shotgun2_norm.tga and b/textures/shotgun2_norm.tga differ
index ea9a7d86d7f36da0f807eed5b04567966df3bdee..442ced63a698906dbc6a1590aefc4e1fda8f98d4 100644 (file)
Binary files a/textures/shotgun2_shirt.tga and b/textures/shotgun2_shirt.tga differ
index 801314a6d82121f00f33e0766e0e4dd2ef78d2a8..10bd39d94b738433bf00628933b5185f9d2f7975 100755 (executable)
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-balance_cfgs="balance25.cfg balanceSamual.cfg balanceXPM.cfg"
-
-countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-for b in $balance_cfgs; do
-       countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+for b in balance*.cfg; do
+       countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
        if [ "$countw" != "$countb" ]; then
                echo "Mismatch between balance.cfg and $b. Aborting."
                exit 1