merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly...
authorFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:54:46 +0000 (08:54 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:54:46 +0000 (08:54 +0200)
commitc7ba32c43f0c0eb2e34732c0f82fa84ce89bc916
tree9667c161c98c0ea2ef084848a29d72a6aafbf539
parentcb0dd369118ab822156128516ebcdd8350c70e9b
merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly unrelated... This is so I could make the colorpicker compatible with the changes in fruitiex/panelhud. Also, terencehill must have forgot a cvar from defaultXonotic.cfg, and setDependent was inverted.
defaultXonotic.cfg
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c