Merge branch 'fruitiex/xpm' into fruitiex/ctsfix

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index 37aee96d07a9f96acdff42e9cccfae4441f29119..35d5da985993d7ad40c8d974ebf7620ba60ac08b 100644 (file)
--- 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 5660a33421e5d6d3f65b4651789af40e2dc33334..2ae8d2d6b8c7316b5ec7ed0de79d58ed59b880bc 100644 (file)
--- 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 82d996f55bcea8600e6e54d8c5227963e8921588..6467afad4c3b13e354e3fc8ad6069c94194cd2a2 100644 (file)
--- 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 f328f8967b67db1c46b4af61d66c5dd87951e2da..a19617d93f89be9ef474bff4f7820936bb72920e 100644 (file)
--- 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 805df99b8831070346e637f3eb9cc068463f9c4b..c3329426e1370368da1a0dbea20c03d8aa19501b 100644 (file)
--- 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 dc82a81f54702c34e8273b6003e42fd25f09b1bb..2f23ae763dbdb30e0da4f093d4fe269dce4e6bcf 100644 (file)
--- 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 5d9a1280b6ae7d4bb21adef218a4edcc5aada830..bb6133a8b79f8b08fef018af239bc84425235b07 100644 (file)
--- 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 064499002a2981fd266240bbb63bc2467eafc4dd..01e446e8ba32c2219d4f366c94e8b307ce88fcc9 100644 (file)
--- 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 6e112b9f67f3ccdcc7e26a0c7477a4fe85d16120..de2ff2591250b235a69eea7525611167386cf78d 100644 (file)
--- 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 d4e1f54ababe70d5aadcbc7cdac254b344881e94..64ac7b019cafcc6947711454fa968d39432ebd19 100644 (file)
--- 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 6cb19f1bde23333f0f2363419496b0dc72b3ce5c..c527b29efb3489637e6defbbfdea9d460b404f59 100644 (file)
--- 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 4796765cd3db3c906d7c0b436120d755d2f7c9b9..aa2f530cdf6f782bafa86b1264a3f942cf8fb108 100644 (file)
--- 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 c4d60c7f333b0a84d84315158ed8f82c77ff308e..0622e1a48134efa1e984be177e67f30e9dc137d1 100644 (file)
--- 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 d317514c00f0232528c7c97a3078c976bdbc3f07..1d15fe1d67be61adbdbf3c50b4fe89b8d6be3a72 100644 (file)
--- 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 af5f3863278bdab434c3217c22fbc00062607ef6..5b6db6b944c423b765a301238414d854ce41bf04 100644 (file)
--- 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 8fa5abc006df61b586cd358c6b4f55cab50feeca..f7661523ea146abdb371ee77589e5401600a641e 100644 (file)
--- 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 e67832dcb74a97c64ab3562a166b0475a591c37f..2f12a4ebceb3ac7cea0e1ed94f7d7f1aa1ac2bf4 100644 (file)
--- 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 6fb02afe7880a41e02bb26f8242030acb6c9f5ef..509310843b5e31ebbd5c6c18e56bd6291f0448b6 100644 (file)
--- 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 927fef3c44edd49d4ddf7eced660035966311204..dc580a51190ead71c541fc9833e70c0e0449ccf0 100644 (file)
--- 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 7828cc608b2303368ab4bb3bfb32f2fc879a1ed8..c5f21116ec9a4bff476338502dace8b7a9937a8b 100644 (file)
--- 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 37973aef68f90d59a53e9ec7aaa1793cb6bfb939..a50427155e11414f2d3362960165284e1cb2344b 100644 (file)
--- 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 2f325586e363f133153ffcce967a796807d6c5e5..9725e8cc4a207e12d49789ea413ba09ddcc35707 100644 (file)
--- 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 03be62dd43d66b6c586750aef68e42a1fd7140bb..75c70c1818bec4bac9ef7dae8f2e361412a39e63 100644 (file)
--- 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 7492b415c56220840633b2aa256913b391931e2f..731b1482e6ddae0e04cc904cdebe671ba55c107f 100644 (file)
--- 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 811084dd5f316c3e8e32120cf8f3a8279d5a1be6..068d22ce67c7387e0b4ec3574dd434df246899c7 100644 (file)
--- 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 467c4212a02626942b5557f0d86c5a740f1b9d5f..72ca9ffcae73a43a275813ab8865ca882290c7ab 100644 (file)
--- 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 8a62f3e053c355a24d1f14c519f0e0d6a009e849..051775de9a900680e0ab37949b827f1d798387a7 100644 (file)
--- 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 18973158ebd47fb1de2ad0f06cee71f039bd1b52..8fec0268663a6455b1631276e941457ac0b74c41 100644 (file)
--- 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 6c6b8a4ec54133fba4d6ec2ad082419a762ab319..9191ab8e83d66f2f2e9d9142d36182ed21ff5f4c 100644 (file)
--- 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 519db9f729fbde9d008ec3bbb6443a0832019a32..3e7ee55570fa21cc92fa488a4aaae9b3a99336a4 100644 (file)
--- 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