From d74783cdaefc98a965718d027b90986561a9b574 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 3 Feb 2013 02:43:02 +0200
Subject: [PATCH] Post-merge tweaks and clear some more finished TODO's

---
 data/defaultVT.cfg |  7 -------
 docs/TODO.txt      | 10 +---------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index bd806609..df5e9147 100644
--- 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"
 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"
 
-set g_leanplayer_damage 0.3 "lean players that are shot by this amount, based on the force they take"
-set g_leanplayer_damage_fade 0.95 "how fast players return to normal angles, based on damage taken"
-set g_leanplayer_damage_max 10 "damage leaning is limited to this amount"
-set g_leanplayer_acceleration 0.05 "lean players as they accelerate, by this amount"
-set g_leanplayer_acceleration_fade 5 "velocity averaging steps for acceleration, higher values cause a shorter leaning"
-set g_leanplayer_acceleration_max 10 "acceleration leaning is limited to this amount"
-
 set sv_gibhealth -150 "Amount of health a dead body must have in order to get gibbed, influenced by player size"
 
 set sv_punchangle_speed 16 "speed at which punchangle returns to normal"
diff --git a/docs/TODO.txt b/docs/TODO.txt
index a9172ea2..e0f070c1 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -234,12 +234,10 @@
 
 - 0.8: Place server.cfg in data by default? Also, do we need the server folder any more then?
 
-- 0.8?: Multiple mods, and different maps and textures (so I can keep the existing VT plus a version with the Xonotic maps)
+- +0.9?: Multiple mods, and different maps and textures (so I can keep the existing VT plus a version with the Xonotic maps)
 
 - 0.8: Add shortcuts for video capture keys, and make sure video capture defaults are good.
 
-- 0.8: Port scoreboard respawn information from Xonotic.
-
 - 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
@@ -248,12 +246,6 @@
 
 - 0.8: Black & White view when dead?
 
-- 0.8: Remove model leaning, its broken
-
-- 0.8: Default respawn delay to something a little bigger
-
-- 0.8: Port the "respawning in" text from Xonotic?
-
 - 0.8: Define all weapons in a single text file (rename the grabber file to be general)
 
 - 0.8: Add patterns for stomach kicking, where you need to match some movement keys
-- 
2.39.5