Merge master

diff --cc data/qcsrc/client/hud.qc
Simple merge

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