drfrag666 / gzdoom

- Swapped 3x2 and 4x2 modes.

# Conflicts:
#	src/r_draw.cpp
#	wadsrc/static/menudef.txt

…mber instead of alphabetically."

This reverts commit 88778f6.

Not in a classic version.

(cherry picked from commit 8d95ee6)

# Conflicts:
#	src/g_game.cpp

…ive.

(cherry picked from commit faea61c)

# Conflicts:
#	src/g_game.cpp

SVN r2998 (trunk)

(cherry picked from commit 2f06007)

Patches from DeHackEd 2.3 and 2.4 are now loaded without warnings/errors

(cherry picked from commit a1a0bde)

# Conflicts:
#	src/d_dehacked.cpp

…l methods that used RealPickup.

Some DECORATE hacks make it possible that this does not contain a valid pointer when these methods are called.

(cherry picked from commit 2afadb0)

# Conflicts:
#	src/d_dehacked.cpp

These would otherwise print an error message but there's a lot of maps out there which only have an empty entry to mark the map as Hexen format.

(cherry picked from commit b8e392e)

# Conflicts:
#	src/p_setup.cpp

…tead of alphabetically.

…systems.

(cherry picked from commit 44f9f2b)

… gcc before adding truecolor support in software.

- Revert "- Shortened level name in the savegame info box since time didn't fit."

(cherry picked from commit 5d27bf7)

# Conflicts:
#	src/win32/i_system.cpp
#	zdoom.vcproj

…ors.

# Conflicts:
#	src/r_draw.cpp

…port.

- Added compatibility mode option to the GL menu.

# Conflicts:
#	src/r_draw.cpp

# Conflicts:
#	src/r_draw.cpp
#	src/r_main.cpp
#	wadsrc/static/menudef.txt

# Conflicts:
#	src/r_draw.cpp

…ode.

# Conflicts:
#	src/r_draw.cpp
#	src/r_main.cpp
#	wadsrc/static/menudef.txt