From: FruitieX Date: Sun, 12 Dec 2010 10:57:56 +0000 (+0200) Subject: Merge branch 'fruitiex/xpm' into fruitiex/ctsfix X-Git-Tag: xonotic-v0.1.0preview~51^2~2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a221addae650229531ec0816248f1e8344039d33;hp=7e2aacbe5ab40622c1bda6c64d34d852f4ad3cfb Merge branch 'fruitiex/xpm' into fruitiex/ctsfix --- diff --git a/defaultXPM.cfg b/defaultXPM.cfg index 37aee96d07..35d5da9859 100644 --- a/defaultXPM.cfg +++ b/defaultXPM.cfg @@ -1,22 +1,32 @@ +// Xonotic ProMode exec defaultXonotic.cfg -exec physicsXPM.cfg -set g_start_weapon_laser 0 -set g_balance_weaponswitchdelay 0 +//============== +// pure changes +//============== -set g_shootfromcenter 1 +// players +sv_fbskin_green // visible playermodel forced on everyone -set g_forced_respawn 1 +//================ +// impure changes +//================ -set g_mirrordamage 0 -set g_friendlyfire 1 +// players +g_jump_grunt 1 // make enemies even easier to hear when they're jumping around -set timelimit_overtimes 1 +// physics +exec physicsXPM.cfg // XPM physics. Similar to vanilla Xonotic physics, with a different way to accelerate: through strafejumping -set sv_fragmessage_information_stats 0 +// balance +set g_balance_weaponswitchdelay 0 // no switch animation, this is standard in "pro modes" ;) +set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly) -// force a visible playermodel! -set sv_defaultcharacter 1 -set sv_defaultplayermodel "models/player/nyx.iqm" -set sv_defaultplayercolors 60 -set g_fullbrightplayers 1 +// match rules +set timelimit_overtimes 1 // overtimes on, draw matches are less interesting! :) +set g_forced_respawn 1 // no delaying/cheating a match by not spawning +set g_mirrordamage 0 // hurting teammates does not hurt you... +set g_friendlyfire 1 // ...it hurts them. + +// info +set sv_fragmessage_information_stats 0 // don't reveal how much health/armor the attacker had diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg index 5660a33421..2ae8d2d6b8 100644 --- a/physicsCPMA.cfg +++ b/physicsCPMA.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 320 diff --git a/physicsFruit.cfg b/physicsFruit.cfg index 82d996f55b..6467afad4c 100644 --- a/physicsFruit.cfg +++ b/physicsFruit.cfg @@ -29,3 +29,4 @@ sv_doublejump 1 // TINY (1.35x normal) doublejumps only, can be disabled if want sv_jumpspeedcap_min 0 // need predicting? (it should already be in CSQC prediction code) sv_jumpspeedcap_max 0.35 sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0 diff --git a/physicsHavoc.cfg b/physicsHavoc.cfg index f328f8967b..a19617d93f 100644 --- a/physicsHavoc.cfg +++ b/physicsHavoc.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg index 805df99b88..c3329426e1 100644 --- a/physicsLeeStricklin-ModdedFruit.cfg +++ b/physicsLeeStricklin-ModdedFruit.cfg @@ -38,3 +38,4 @@ sv_doublejump 0 // TINY (1.35x normal) doublejumps only, can be disabled if want sv_jumpspeedcap_min 0 // need predicting? (it should already be in CSQC prediction code) sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0 diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg index dc82a81f54..2f23ae763d 100644 --- a/physicsLeeStricklin.cfg +++ b/physicsLeeStricklin.cfg @@ -38,3 +38,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0 diff --git a/physicsLeeStricklinOld.cfg b/physicsLeeStricklinOld.cfg index 5d9a1280b6..bb6133a8b7 100644 --- a/physicsLeeStricklinOld.cfg +++ b/physicsLeeStricklinOld.cfg @@ -33,3 +33,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max 0.38 sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsLzd.cfg b/physicsLzd.cfg index 064499002a..01e446e8ba 100644 --- a/physicsLzd.cfg +++ b/physicsLzd.cfg @@ -31,3 +31,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz10.cfg b/physicsNexuiz10.cfg index 6e112b9f67..de2ff25912 100644 --- a/physicsNexuiz10.cfg +++ b/physicsNexuiz10.cfg @@ -31,3 +31,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz11.cfg b/physicsNexuiz11.cfg index d4e1f54aba..64ac7b019c 100644 --- a/physicsNexuiz11.cfg +++ b/physicsNexuiz11.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz151.cfg b/physicsNexuiz151.cfg index 6cb19f1bde..c527b29efb 100644 --- a/physicsNexuiz151.cfg +++ b/physicsNexuiz151.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz151b.cfg b/physicsNexuiz151b.cfg index 4796765cd3..aa2f530cdf 100644 --- a/physicsNexuiz151b.cfg +++ b/physicsNexuiz151b.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz16rc1.cfg b/physicsNexuiz16rc1.cfg index c4d60c7f33..0622e1a481 100644 --- a/physicsNexuiz16rc1.cfg +++ b/physicsNexuiz16rc1.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz20.cfg b/physicsNexuiz20.cfg index d317514c00..1d15fe1d67 100644 --- a/physicsNexuiz20.cfg +++ b/physicsNexuiz20.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz25.cfg b/physicsNexuiz25.cfg index af5f386327..5b6db6b944 100644 --- a/physicsNexuiz25.cfg +++ b/physicsNexuiz25.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNexuiz26.cfg b/physicsNexuiz26.cfg index 8fa5abc006..f7661523ea 100644 --- a/physicsNexuiz26.cfg +++ b/physicsNexuiz26.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg index e67832dcb7..2f12a4ebce 100644 --- a/physicsNoQWBunny-nexbased.cfg +++ b/physicsNoQWBunny-nexbased.cfg @@ -39,3 +39,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0 diff --git a/physicsQ.cfg b/physicsQ.cfg index 6fb02afe78..509310843b 100644 --- a/physicsQ.cfg +++ b/physicsQ.cfg @@ -31,3 +31,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsQ2.cfg b/physicsQ2.cfg index 927fef3c44..dc580a5119 100644 --- a/physicsQ2.cfg +++ b/physicsQ2.cfg @@ -30,3 +30,4 @@ sv_doublejump 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg index 7828cc608b..c5f21116ec 100644 --- a/physicsQ2a.cfg +++ b/physicsQ2a.cfg @@ -31,3 +31,4 @@ sv_doublejump 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsQ3.cfg b/physicsQ3.cfg index 37973aef68..a50427155e 100644 --- a/physicsQ3.cfg +++ b/physicsQ3.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 320 diff --git a/physicsQBF.cfg b/physicsQBF.cfg index 2f325586e3..9725e8cc4a 100644 --- a/physicsQBF.cfg +++ b/physicsQBF.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsQBFplus.cfg b/physicsQBFplus.cfg index 03be62dd43..75c70c1818 100644 --- a/physicsQBFplus.cfg +++ b/physicsQBFplus.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsSamual.cfg b/physicsSamual.cfg index 7492b415c5..731b1482e6 100644 --- a/physicsSamual.cfg +++ b/physicsSamual.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg index 811084dd5f..068d22ce67 100644 --- a/physicsWarsow.cfg +++ b/physicsWarsow.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg index 467c4212a0..72ca9ffcae 100644 --- a/physicsWarsowClassicBunny.cfg +++ b/physicsWarsowClassicBunny.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg index 8a62f3e053..051775de9a 100644 --- a/physicsWarsowDev.cfg +++ b/physicsWarsowDev.cfg @@ -30,3 +30,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 0 +g_teleport_maxspeed 0 diff --git a/physicsX0.cfg b/physicsX0.cfg index 18973158eb..8fec026866 100644 --- a/physicsX0.cfg +++ b/physicsX0.cfg @@ -38,3 +38,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0 diff --git a/physicsXPM.cfg b/physicsXPM.cfg index 6c6b8a4ec5..9191ab8e83 100644 --- a/physicsXPM.cfg +++ b/physicsXPM.cfg @@ -34,3 +34,4 @@ sv_doublejump 1 sv_jumpspeedcap_min 0 sv_jumpspeedcap_max 0.5 sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 320 diff --git a/physicsXPMLight.cfg b/physicsXPMLight.cfg index 519db9f729..3e7ee55570 100644 --- a/physicsXPMLight.cfg +++ b/physicsXPMLight.cfg @@ -34,3 +34,4 @@ sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 +g_teleport_maxspeed 0