From: unknown Date: Thu, 11 Nov 2010 00:05:50 +0000 (+0100) Subject: Merge remote branch 'origin/master' into tzork/balance-tzork X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff35e838d3cfa0162951d604d213e48aeb771e80;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into tzork/balance-tzork Conflicts: balancetZork.cfg qcsrc/server/w_crylink.qc --- ff35e838d3cfa0162951d604d213e48aeb771e80 diff --cc balancetZork.cfg index 11733c3fa,ab53f4753..22371f25e --- a/balancetZork.cfg +++ b/balancetZork.cfg @@@ -429,15 -394,12 +428,20 @@@ set g_balance_crylink_primary_refire set g_balance_crylink_primary_animtime 0.4 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 -set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_joinspeed 2000 +set g_balance_crylink_primary_joinboost 2 -set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 +set g_balance_crylink_primary_middle_lifetime 5 set g_balance_crylink_primary_middle_fadetime 5 ++<<<<<<< HEAD +set g_balance_crylink_primary_star_lifetime 5 +set g_balance_crylink_primary_star_fadetime 5 +set g_balance_crylink_primary_other_lifetime 5 +set g_balance_crylink_primary_other_fadetime 5 ++======= + set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300 + set g_balance_crylink_primary_other_fadetime 0.25 ++>>>>>>> origin/master set g_balance_crylink_secondary 1 set g_balance_crylink_secondary_damage 2 @@@ -542,14 -503,9 +546,20 @@@ set g_balance_rocketlauncher_guiderated 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 set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again ++<<<<<<< HEAD +set g_balance_rocketlauncher_laserguided_speed 1000 //650 +set g_balance_rocketlauncher_laserguided_speedaccel 0 +set g_balance_rocketlauncher_laserguided_speedstart 1000 +set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5 +set g_balance_rocketlauncher_laserguided_allow_steal 1 +set g_balance_rocketlauncher_remote_damage 120 +set g_balance_rocketlauncher_remote_edgedamage 25 +set g_balance_rocketlauncher_remote_radius 130 ++======= + set g_balance_rocketlauncher_remote_damage 90 + set g_balance_rocketlauncher_remote_edgedamage 20 + set g_balance_rocketlauncher_remote_radius 125 ++>>>>>>> origin/master set g_balance_rocketlauncher_remote_force 350 // }}} // {{{ porto diff --cc qcsrc/server/defs.qh index fc01718ca,95fce0ade..5302aef50 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@@ -658,6 -654,7 +654,8 @@@ string deathmessage .entity realowner; .float nex_charge; +.float nex_charge_rottime; float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended) + + float serverflags; diff --cc qcsrc/server/w_crylink.qc index bf65d03b8,566563487..f3d9a6cbf --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@@ -518,4 -562,4 +562,4 @@@ float w_crylink(float req return TRUE; } #endif --#endif ++#endif