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.
Add build file for Travis CI.
Merge pull request #700 from nukeykt/opl-timer-fix
setup: Use TXT_If() for display settings.
setup: Only show PC speaker option for Doom.
setup: Use conditionals for sound dialog.
textscreen: Add widget for conditionally hiding.
setup: Overhaul sound config dialog.
Merge remote-tracking branch 'origin/master' into sdl2-branch
video: Remove useless command line arguments.
Merge remote-tracking branch 'origin/master' into sdl2-branch
osx: Bump OSX deployment target to 10.7.
osx: Tweak launcher interface.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
video: Tweak command line parameters.
video: Fix rounding up of window_height adjust.
video: Add a back door for non-desktop fullscreen.
video: Rename screen_{width,height} variables.
Remove autoadjust_video_settings variable.
video: Fix aspect ratio when resizing windows.
video: Set minimum window size for SDL window.
video: Get rid of SCREENWIDTH_4_3 constant.
video: Fix up behavior for fullscreen mode change.
setup: Remove widget for disk activity icon.
video: Remove show_diskicon from video code.
diskicon: De-dupe icon dimension constants.
diskicon: Fix Strife disk icon.
diskicon: Draw disk icon with black background.
Use a heuristic approach to detect infinite state cycles
Fix STDISK patch offset calculation.
Refactor loading disk icon code.
NEWS: change khokh2001 attribution to Nuke.YKT
NEWS: Use past-tense rather than present and imperative.
NEWS: Strife IWAD/voices.wad loading behavior tweak
Swap order of checks for voices.wad; resolve issue #675
NEWS: Update for the current state of the repo. Maybe release soon...?
d_iwad: Find Strife from a GOG.com installation
Merge pull request #705 from nukeykt/dmxgus
Merge pull request #710 from fragglet/sdl2-branch
textscreen/fonts: Support Pillow in addition to PIL
Merge pull request #711 from adararnon/bugfix/windows-codeblocks
All projects now compile correctly on Windows
joystick: Use SDL GUID to identify joysticks.
setup: Fix use of SDL_JoystickID.
Merge pull request #709 from adararnon/bugfix/codeblocks
consider aspect_ratio_correct when saving PNG screenshot
Merge pull request #696 from jmtd/sdl2-fullscreen-toggle
doom: Use inequality comparison for the freedoom variant (thanks Jon)
Merge pull request #702 from chungy/master
music: DMX's "GUS instrument mappings bug" emulation
video: depend on SDL_Image for taking PNG screenshots
Merge pull request #703 from chocolate-doom/gamevariant
doom: Always allow loading PWADs for Freedoom: Phase 1
Merge pull request #635 from chungy/automake_bindir
automake: install binaries to ${bindir} not ${exec_prefix}/games
opl_sdl.c: remove unused variable "i"
gamevariant can be either freedoom or freedm
introduce a gamevariant variable to tell different IWADs apart
Merge pull request #701 from krystalgamer/patch-1
Removed non-existing files from project
opl: fix time calculation after tempo change
Merge pull request #699 from jmtd/sdl2-setup-resolutions
remove 256x200 resolution option
vary fullscreen keyboard shortcut by platform
[sdl2-branch] toggle fullscreen with cmd+enter
Merge pull request #691 from jmtd/sdl2-branch-jmtd-input
setup: re-arrange display menu options
textscreen: Fix handling of mapped input chars
remove fullscreen mode selection and related code
remove four SDL2-TODOs: no further work needed
Merge pull request #688 from jkbenaim/heretix-namefix
Heretic: Add map names for Episode 6
Merge pull request #687 from chocolate-doom/jmtd-doc-install-freedm
Update INSTALL.template
Merge pull request #683 from nukeykt/authors2
Merge pull request #679 from jmtd/osx-launcher-lmp
Add support for .lmp file formats to Mac Launcher
Cast player pitch to unsigned when calculating sigil mega blast trajectory
Verified change to AM_addMark logic
Verified changes needed to P_KillMobj
textscreen: Move fonts into PNG files.
pw_invisibility is in fact cleared on burning death; addl resolution for issue #663
Address multiple issues identified by nukeykt; partially resolves issue #663
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
Allow SDL headers and libraries to exist in the msvc project directory
Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch
textscreen: Set linear scaling for texture buffer.
Remove remaining setpanning_workaround code
Merge pull request #672 from jmtd/jmtd-revert-mrandom-seeding