cp-with-libs: add dsound.dll to the list of bundled DLLs
i_sdlmusic: avoid code duplication and code path splitting
video: disable VSYNC if software rendering is enforced
Merge pull request #953 from ericwa/sdl2-branch
Allocate large enough buffer for SDL_ConvertAudio.
strife: Move D_IdentifyVersion() earlier in startup.
setup: Tweak server list interface.
textscreen: Add extern "C" for C++ imports.
sound: Refuse to start with SDL 2.0.6.
video: remove redundant comment
video: calculate actualheight only once
Merge pull request #948 from jmtd/joypad-look
don't rely on enum ordering for game properties
address some minor review comments
Permit binding of joystick axes to look up/down
config: only define str[n]casecmp if necessary
cdmus: Change I_CDMusInit() to return failure.
net: Make "Players" column more compact.
net: Increase width of "Address" column.
net: Include protocol list in query responses.
net: Move protocol list code to net_structrw.c.
video: simplify PNG screenshot code
Merge pull request #946 from devnexen/sdl2-branch
Merge pull request #943 from fragglet/sdl2-branch
net: Make a bunch of things const.
net: Reduce scope of variables.
net: Add clarifying comments about net_protocol_t.
net: Fix incorrect loop condition.
net: Get rid of NET_SafePuts().
net: Add protocol negotiation on client connection.
Merge pull request #942 from chocolate-doom/makemake
Make "make" aware of convenience libraries in subdirectories
Merge pull request #940 from chocolate-doom/shorttics
replace M_CheckParm() with M_ParmExists()
add a -shorttics command line option
video: Fix out-of-date comment.
Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch
heretic: Remove list terminator for alphSwitchList.
Add cppcheck static analysis to travis build (#939)
Add checks in P_RespawnSpecials().
Fix warnings about P_InitSwitchList() overruns.
textscreen: Check return value from realloc().
Merge branch 'master' into sdl2-branch
d_iwad: Find the GOG install of Doom 3: BFG
Remove duplicate I_Realloc() definition
Merge branch 'master' into sdl2-branch
Simplify I_Realloc() logic around error check
Remove two post-realloc checks that are now redundant
Demand use of I_Realloc() instead of realloc() in the HACKING guide
replace calls to realloc() with the new I_Realloc()
i_system: Add an I_Realloc() function
Merge branch 'master' into sdl2-branch
Merge pull request #937 from chocolate-doom/i_realloc
Simplify I_Realloc() logic around error check
Remove two post-realloc checks that are now redundant
Demand use of I_Realloc() instead of realloc() in the HACKING guide
replace calls to realloc() with the new I_Realloc()
i_system: Add an I_Realloc() function
Merge commit '76d72fc48dc88fac4faa8b0b3907679eb8555778' into sdl2-branch
video: Fix resource leak on PNG saving failure paths (#933)
setup: Remove porch/integer scale controls.
doom: Fix "Screen Size" label with BFG IWADs.
Merge pull request #928 from fjrosario/patch-2
Fixed grammer error in README.md
Write an aspect-correct PNG only if aspect_ratio_correct is set.
WritePCXfile: set hres/vres so the aspect ratio is set to 1:1
Merge pull request #923 from turol/va_end
Merge pull request #881 from AlexMax/chocolate-midivolume
Merge branch 'sdl2-branch' into chocolate-midivolume
NEWS: Move stray "HEAD" entry to the 3.0.0 section.
Merge pull request #918 from devnexen/mem_leak_fixes
Tiny memory leak fix in call error path.
Merge pull request #913 from chocolate-doom/last_resize_time
video: turn 500 ms delay into a constant
video: omit drawing to screen until the window resize has finished
video: update scaled texture also when switching fullscreen
video: apply windows self-resizing only after a 500 ms delay
Win32: do not redefine WIN32_LEAN_AND_MEAN
textscreen: zenity chooser file filter tweaks (#909)
Merge branch 'master' into sdl2-branch
data/convert-icon: Support Pillow in addition to PIL
Merge pull request #904 from jmtd/nes30pro
Re-order NES30 Pro and FC30 Pro entries
Yet another FC30 variant
joystick: Add NES30 Pro Joystick mode
joystick: Add NES30 Pro (not FC30) mappings for Linux
mappings for NES30 Pro on Linux
Adjust NES30Pro joypad settings, add FC30 Pro
Merge pull request #900 from jmtd/joystick-hysteresis
move joystick hysteresis to i_video
video: move video_display check to I_GetWindowPosition()
Merge branch 'joystick-allow-savegames' into sdl2-branch
Adjustments to selecting save slots via joypad
Create a savegame name by pressing Fire with joystick.
doom menu joystick handling cleanup
small typo in a comment
Fix detection of triggers in XBox 360 wireless gamepad. (#889)