Merge remote branch 'origin/master' into samual/keepaway

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 78783ac89a4f0871737e8ad6b4b659fde684d188..5858ec21360f5e23c67acf8cecbb9f256140fe15 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -392,12 +392,12 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 400
 // }}}
 // {{{ crylink 
-set g_balance_crylink_primary_damage 14
+set g_balance_crylink_primary_damage 10
 set g_balance_crylink_primary_edgedamage 0
 set g_balance_crylink_primary_force -55
 set g_balance_crylink_primary_radius 50
-set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.02
+set g_balance_crylink_primary_speed 3000
+set g_balance_crylink_primary_spread 0.05
 set g_balance_crylink_primary_shots 4
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.4
@@ -415,20 +415,20 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_other_fadetime 0.25
+set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 8
 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_speed 9000
 set g_balance_crylink_secondary_spread 0.03
-set g_balance_crylink_secondary_shots 4
+set g_balance_crylink_secondary_shots 3
 set g_balance_crylink_secondary_bounces 0
 set g_balance_crylink_secondary_refire 0.2
-set g_balance_crylink_secondary_animtime 0.1
+set g_balance_crylink_secondary_animtime 0.2
 set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
@@ -442,8 +442,8 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
-set g_balance_crylink_secondary_line_fadetime 2
+set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_fadetime 5
 // }}}
 // {{{ nex
 set g_balance_nex_primary_damage 90

diff --git a/gfx/menu/luminos/checkbox_d0.tga b/gfx/menu/luminos/checkbox_d0.tga
index 4f0b00157df434b9582071b436ffed2ff68b2a96..f94884483987e7133d11eb4bfd06477248720fd0 100644 (file)
Binary files a/gfx/menu/luminos/checkbox_d0.tga and b/gfx/menu/luminos/checkbox_d0.tga differ

diff --git a/gfx/menu/luminos/checkbox_f0.tga b/gfx/menu/luminos/checkbox_f0.tga
index 5f19b3caa0019f45f45856e7ef992f3aaf4a582b..c04496827e11423beeb305a2cbf804eeb3d6a25f 100644 (file)
Binary files a/gfx/menu/luminos/checkbox_f0.tga and b/gfx/menu/luminos/checkbox_f0.tga differ

diff --git a/gfx/menu/luminos/checkbox_n0.tga b/gfx/menu/luminos/checkbox_n0.tga
index c062f31c0e77c0a0b0062b7a5d280d04cb624124..b0efdda8380af4a3917399988459bba8d24e6c5b 100644 (file)
Binary files a/gfx/menu/luminos/checkbox_n0.tga and b/gfx/menu/luminos/checkbox_n0.tga differ