Credit Alexey Khokholov by name rather than username.
Rollback of 4f8f8a43e174f1e82dc0160c0ea96070e1cf6ef9.
NEWS: Add draft notes for 2.2.0 release.
opl: Some minor tweaks to the last merge.
Merge pull request #516 from khokh2001/oldopl
opl: Tweak voice replacement algorithm.
Oops, revert debug changes
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
desktop: Add some additional keywords to *.desktop files
Change license statement on sha1.c to GPLv2.
Merge pull request #542 from chungy/final2_sky_fix
Replace AES implementation with the Linux one.
doom: the sky changes in final2 map11->12 and map20->21 transitions.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Add back the Doom PWAD reload hack.
warnings: fix "variable ‘..’ set but not used" warnings
warnings: fix "redundant redeclaration of ‘player_names’"
warnings: fix "iteration XY invokes undefined behavior" warnings
warnings: fix ".. may be used uninitialized in this function" warnings
hexen: Don't show v1.0 message for demo version.
hexen: Show a startup warning if using v1.0 IWAD.
warnings: fix "address of array .. will always evaluate to 'true'"
warnings: fix "value computed is not used" warnings
remove duplicate src/doom/doom.desktop.in template
warnings: fix some cast to/from pointer from/to int warnings
Perform case-insensitive check for .lmp extension.
man: fix the very last hyphen used as minus sign
man: fix one last hyphen used as minus sign
include <string.h> in z_zone.c for memset()
doom: Clear origin pointer when stopping sound.
zone: Add -zonescan parameter.
zone: Add -zonezero parameter.
Don't read currentthinker->next after Z_Free().
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
deh: fix parsing of last lines in files without newline at EOF
setup: Remove "enable gamepad" checkbox.
setup: Add joyb_jump to empty defaults.
setup: Undo axis reversal for Gameport adapter.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
setup: Invert both axes for Gameport adapter.
Fix assigning structs not compiling on Visual Studio
Clear mouse events caused by mouse warp.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Merge pull request #521 from chungy/xbone-pad
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
setup: Add config for USB Gameport adapter.
setup: Add OS X config for Gameport adapter.
Strip out SDL_VERSION_ATLEAST #ifdef conditionals.
setup: Add help URLs for configuration windows.
textscreen: Add help URL functionality for windows.
Merge pull request #523 from chocolate-doom/hexndemo
The 4-Level Demo Version also has 3 Info pages
Turn maxplayers into a global variable
textscreen: Remove screen size-based font selection.
net: Include port number in address strings.
misc: Handle M_StringCopy() short buffer case.
Remove old DOS source files.
Avoid calling strlen() on a potentially unterminated string
Add a wrapper with "void (void)" signature around G_CheckDemoStatus
Move MSVC-specific inline definition to doomtype.h
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
setup: add support for the Xbox One controller on Linux
man: Use \- to denote dashes. Fixes #512
play sound when trying to enter a forbidden map in the demo version
maintain an explicit switch list for the demo version
Hexen and Heretic use older DMX. Since OPL Voice Allocating algorithm differ. This commit adds old DMX's voice allocating alogrithm for Hexen and Heretic.
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
Initialize floor->type and floor->crush fields in EV_BuildStairs()
Switch pick-up messages for Chaos Device and Disc of Repulsion
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Fix mistaken uses of memcpy() on overlapping memory.
Fix game code that makes false boolean assumptions.
doom: Change weaponowned[] to an int array.
Apparently, the Hexen font only has upper-case chcracters
setup: fix "control reaches end of non-void function" compiler warning
Identify the "shareware" version early on.
currently, no separate startup banner for the demo version :(
adapt cheat codes for the demo version
set the max_players limit in network games to 4 in shareware mode
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
First shot at support for the Hexen 4-level Demo
PHILOSOPHY: Expand discussion on minimalism.
Add extra checks to weapon cycling loops.
Merge pull request #502 from dbrackett16/patch-1
Fixed Missing File in project
man: fix typo in manual generation
add missing includes for calling SHORT() in Heretic
Merge pull request #493 from derek57/patch-3
Merge pull request #492 from derek57/patch-2
Merge pull request #495 from WinterMute/build-outside-source-dir
allow building in subdirectory or outside source directory
even more endianness fixes by myself (Ronald Lasmanowicz)
even more endianness fixes by myself (Ronald Lasmanowicz)