Merge 1837,1839,1841,1842,1847 from 0.6-dev.

git-svn-id: http://odamex.net/svn/root/trunk@1938 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1836,1854,1855,1856,1857,1864,1865 from 0.6-dev, more difference reduction in files.

git-svn-id: http://odamex.net/svn/root/trunk@1939 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1868,1869,1885,1886,1897 from 0.6-dev:
- Fix bug 631
- Fix broke console while downloading/connecting
- Removed d_net.cpp serverside, not needed
- Let single player games have freelook and jumping, controlled by the client cvars/control mappings


git-svn-id: http://odamex.net/svn/root/trunk@1941 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1849,1859,1860,1902 from 0.6-dev:
- sc_man
- MAPINFO
- Start of hub travel

git-svn-id: http://odamex.net/svn/root/trunk@1942 b0bcef46-2027-0410-bd56-ab726e9a1d04
Do this again, for whatever reason there's a conflict.

git-svn-id: http://odamex.net/svn/root/trunk@1943 b0bcef46-2027-0410-bd56-ab726e9a1d04
- Merge revisions from 0.6-dev: 1956, 1958, 1965

git-svn-id: http://odamex.net/svn/root/trunk@1966 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1852,1853,1863,1872 from 0.6-dev:
- Resolve more differences in headers
- Don't wipe while traveling through hubs

git-svn-id: http://odamex.net/svn/root/trunk@1967 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge up some outstanding commits, now all revs up to 1860 are included in trunk (not including additional merges from later commits).

git-svn-id: http://odamex.net/svn/root/trunk@1968 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1870,1871,1876 from 0.6-dev:
- ANIMDEFS lump support
- A little more hub work, STILL EXPERIMENTAL
- MAPINFO errors just print to console

git-svn-id: http://odamex.net/svn/root/trunk@1969 b0bcef46-2027-0410-bd56-ab726e9a1d04
- Merge from 0.6-dev: r1957

git-svn-id: http://odamex.net/svn/root/trunk@1972 b0bcef46-2027-0410-bd56-ab726e9a1d04
- Merge from 0.6-dev: r1934, r1937

git-svn-id: http://odamex.net/svn/root/trunk@1973 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 1970,part of 1918 from 0.6-dev:
- Fix possible memleak unloading extra wadinfo
- Spectators should appear on the scoreboard

git-svn-id: http://odamex.net/svn/root/trunk@1974 b0bcef46-2027-0410-bd56-ab726e9a1d04
A massive update to merge dev to trunk.  It's been a while, and now all of the open bugs can be tested with trunk.  This is in preparation for a 0.5.1 release.  Also happy 2000th commit on the public repository!

git-svn-id: http://odamex.net/svn/root/trunk@2000 b0bcef46-2027-0410-bd56-ab726e9a1d04
Merge 2001 from 0.6-dev:
- Fix save games

git-svn-id: http://odamex.net/svn/root/trunk@2002 b0bcef46-2027-0410-bd56-ab726e9a1d04
Fix Xbox MSVC project file

git-svn-id: http://odamex.net/svn/root/trunk@2003 b0bcef46-2027-0410-bd56-ab726e9a1d04
Remove temporary "huffman xbox issue" work-around and increase the xbe stack size. Fixes bug 671.

git-svn-id: http://odamex.net/svn/root/trunk@2004 b0bcef46-2027-0410-bd56-ab726e9a1d04
Accelerate the player color sliders when an adjustment key is held down. Fixes bug 660.


git-svn-id: http://odamex.net/svn/root/trunk@2005 b0bcef46-2027-0410-bd56-ab726e9a1d04
Fix potential infinite loop in UpdateJoystickEvents()


git-svn-id: http://odamex.net/svn/root/trunk@2006 b0bcef46-2027-0410-bd56-ab726e9a1d04
Don't disable Xbox joystick polling before making sure there are servers to refresh.


git-svn-id: http://odamex.net/svn/root/trunk@2007 b0bcef46-2027-0410-bd56-ab726e9a1d04
A few revisions were left out of the merge that was performed in r2000. This should make the merge complete.

git-svn-id: http://odamex.net/svn/root/trunk@2008 b0bcef46-2027-0410-bd56-ab726e9a1d04