The Big Merge:

The Big Merge:

LH's weapon settings changes (faster electro)
LH's weapon/pickup config/map restructures
Q3 physics mode
credits now include Qantourisc
merged maps from trunk (we can now delete files)
removed GLSL shader (we can now delete files)
radius damage now uses the player's view origin, not center
optional laser secondary (off by default)
bots use both fire modes (Qantourisc)
rockets can accelerate when set up that way (havoc)
rot/regen can be linear now

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2360 f962a42d-fe04-0410-a3ab-8c8b0445ebaa