From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Feb 2013 08:53:36 +0000 (+0200)
Subject: Merge master
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=37c59c987e7c9dbd39745331cb3833ea583d8555

Merge master
---

37c59c987e7c9dbd39745331cb3833ea583d8555
diff --cc docs/TODO.txt
index 13437e5c,fe0300eb..c887881c
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@@ -215,41 -217,21 +215,59 @@@
  - 0.8: Do what Xonotic did to avoid conflicting versions when joining
  
  - 0.8: Use a modded version of Xonotic's menu skin?
- 
++
 +- 0.8: Put HUD item positions in a text file, to allow for customizable HUD's
 +
 +- 0.8 BUG: When bunny-hopping, you don't hear the landing sound each time. Fix!
 +
 +- 0.8 NEW HUD: With the new system, put all HUD settings in one place
 +
 +- 0.8: Colorize weapon icon in accuracy
 +
 +- 0.8 NEW HUD: Make position of the HUD cvars so that scale works around the center
 +
 +- 0.8: Rename defaultVT to default-VT and so on
 +
 +- 0.8: Introduction movie (ask LH how you do it in DP)
 +
 +- +0.8 NEW HUD: A menu to edit the HUD
 +
 +- 0.8 NEW HUD: Arrange the functions in Sbar_DrawXNum the same way as in the others
 +
 +- 0.8 NEW HUD: Make HUD font scale two-sized too, so it matches everything else
 +
 +- 0.8 NEW HUD: Load and noload should have different position values for the ammo icon
 +
 +- 0.8 NEW HUD: Rename the hud cvar settings accordingly
 +
 +- 0.8 BUG: The crosshair mysteriously gets larger when you have prey
 +
 +- 0.8: Optional 3rd person view for being swallowed and prey
 +
 +- 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.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: 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
+ 
+ - 0.8: If you see the swallow model of a predator you swallow first, clear the model instantly
+ 
+ - 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
+ 
 -- 0.8: Tweak balance so that less damage is dealt and vore lasts more
++- 0.8: Tweak balance so that less damage is dealt and vore lasts more