Post-merge tweaks and clear some more finished TODO's

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index bd80660977cc860494fd214e8e7651e5434ff8fc..df5e9147f6b7d34a35e679b21b4335e6833a64d1 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -326,13 +326,6 @@ set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the p
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"\r
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"\r
 \r
-set g_leanplayer_damage 0.3 "lean players that are shot by this amount, based on the force they take"\r
-set g_leanplayer_damage_fade 0.95 "how fast players return to normal angles, based on damage taken"\r
-set g_leanplayer_damage_max 10 "damage leaning is limited to this amount"\r
-set g_leanplayer_acceleration 0.05 "lean players as they accelerate, by this amount"\r
-set g_leanplayer_acceleration_fade 5 "velocity averaging steps for acceleration, higher values cause a shorter leaning"\r
-set g_leanplayer_acceleration_max 10 "acceleration leaning is limited to this amount"\r
-\r
 set sv_gibhealth -150 "Amount of health a dead body must have in order to get gibbed, influenced by player size"\r
 \r
 set sv_punchangle_speed 16 "speed at which punchangle returns to normal"\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index a9172ea2a922589dcf183647464bd8627fb91c12..e0f070c16335b1a4318be1589f0d7d292356ecb1 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -234,12 +234,10 @@
 \r
 - 0.8: Place server.cfg in data by default? Also, do we need the server folder any more then?\r
 \r
-- 0.8?: Multiple mods, and different maps and textures (so I can keep the existing VT plus a version with the Xonotic maps)\r
+- +0.9?: Multiple mods, and different maps and textures (so I can keep the existing VT plus a version with the Xonotic maps)\r
 \r
 - 0.8: Add shortcuts for video capture keys, and make sure video capture defaults are good.\r
 \r
-- 0.8: Port scoreboard respawn information from Xonotic.\r
-\r
 - 0.8: Orient swallow model based on the direction between you and the player eating you
 
 - 0.8: Use a new texture I found for the stomach\r
@@ -248,12 +246,6 @@
 \r
 - 0.8: Black & White view when dead?\r
 \r
-- 0.8: Remove model leaning, its broken\r
-\r
-- 0.8: Default respawn delay to something a little bigger\r
-\r
-- 0.8: Port the "respawning in" text from Xonotic?\r
-\r
 - 0.8: Define all weapons in a single text file (rename the grabber file to be general)\r
 \r
 - 0.8: Add patterns for stomach kicking, where you need to match some movement keys\r