Merge branch 'master' into sdl2-branch
video: call SDL_GetWindowPixelFormat() only once
NEWS: Update for recent changes.
d_iwad: Really ensure vanilla loading order for GOG.com installs
Ignore Emacs temp files and src/*.cfg src/*.txt
Overflow safety for solidsegs; hopefully interim.
Enable map file in debug build for Hexen
Ignore hexndata under msvc project directory
Get rid of debug comment, and move call up
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
Mix_HaltChannel must always be called when releasing a sound. Fixes #773.
p_spec: fix the wording of a comment about sector overflows
Ensure values retrieved with RegQueryValueEx are null-terminated.
Adjust SFC30 controller defaults to be consistent
Add joystick virtual button for toggle automap
SetVideoMode(): make re-entrant
CreateUpscaledTexture(): set max texture dimensions more generally
SetVideoMode(): remove unused "doompal" variable
Merge pull request #760 from jmtd/defined-random
textscreen: Fix rendering when using a tiling WM.
d_iwad: re-sort the GOG.com games by vanilla IWAD loading order
I don't think we need this anymore
Add P_SubRandom and fix P_Random ambiguities
Implement Vanilla limit of 4046 lumps in a WAD
man: Fix build to allow out-of-tree builds.
docgen: Read included templates from relative path.
Merge pull request #755 from chungy/sdl2-getprefpath
Use SDL_GetPrefPath for the configuration directory.
Merge pull request #754 from chocolate-doom/sdl2-png-screenshots
Revert using SDL_Image for PNG screenshots
Remove some autoconf foo for GL
Merge pull request #745 from chocolate-doom/sdl2-swmode
use SDL_GL_GetProcAddress to avoid GL dependency
Merge pull request #750 from nukeykt/nukedopl174
Add autoconf check for GL and link the engines to it.
Add CheckGLVersion to warn about software GL
Add force_software_renderer video rendering option
Merge pull request #748 from nukeykt/retailfix
diskicon: Use *saved_background for sizeof().
do not naively assume singly-byte frame buffers
video: Set pixel format correctly for rgbabuffer.
make two variables static
Merge pull request #738 from jmtd/sdl2-fix-window-position
Merge pull request #744 from chocolate-doom/sdl2-mousewheel
Fix mix-up of up/down buttons; ignore OS invert
Fix mousewheel for SDL2 by synthesising buttons
textscreen: fix check for size of screen
sdl2: fix window_position config option
setup: Fixes for SFC30 on Linux systems
setup: Add joystick config for 8bitdo SFC/SNES30
INSTALL.template: remove spare "compatible"
INSTALL: Add comment about using FreeDM.
osx: Add FreeDM to IWAD list.
setup: Add joystick config for 8bitdo NES30 PRO.
setup: Reset button map when loading configs.
Add note to CONTRIBUTING guide about formatting.
Fix issue #623: PCX reserved byte should be 0
Remove library deps not needed for sdl2-branch.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Set categories for some command line args.
osx: Remove hack for dealing with .svn directories.
osx: Add help button for command line.
osx: Remove IWADLocation.m from dist.
setup: Use TXT_If() for main menu.
configure: Bump to temporary version number.
Merge remote-tracking branch 'origin/master' into sdl2-branch
osx: New background for .dmg package.
osx: Add missing connection for Chex control.
Merge pull request #730 from nukeykt/retailfix
doom: Fix tab char in last commit.
doom: Fix automap cheat handling when emulating older EXEs.
Merge pull request #728 from nukeykt/retailfix
textscreen: Set parent pointer for conditionals.
textscreen: Make file select more distinguishing.
doom: Fix minor Ultimate/Final Doom and Chex emulation bugs.
doom: Remove commented out code from the last commit
Merge pull request #727 from nukeykt/retailfix
Do make {install,dist} as part of travis build.
Fix some references broken by markdown change.
pkg: Really fix the Makefile from the last commit, include the docs
Convert the rest of the doc files to Markdown.
strife/p_plats.c: Add braces for for() loops and un-indent I_Error().
Convert files from CRLF to LF line endings.
Merge pull request #726 from chungy/readme.md
README: Convert to Markdown format.
pkg: Remove ChangeLog file from binary dists.
setup: Use SNDDEVICE_SB for OPL, not ..._ADLIB.
setup: Avoid use of SDL_JoystickFromInstanceID().
Merge remote-tracking branch 'origin/master' into sdl2-branch
setup: Further simplify display dialog logic.
Switch builds to use Trusty.
Fix travis build of master branch?
setup: Fix crash with Chex Quest warp select.
Use apt addon rather than sudo for builds.
setup: Hide window sizes when fullscreen=true.