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.
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)
Merge pull request #890 from Wintermute0110/joystick-allow-quit-game
Simulate Y/N key press with joystick Fire/Use buttons in YES/NO dialogs.
video: do not ignore 0x0 max texture dimensions
video: Enable running headless with the dummy SDL video driver
Merge pull request #879 from chungy/autoconf_bashcompletion
configure.ac: Use echo|tr to change PROGRAM_PREFIX case
resource.rc.in: Add a winuser.h include, fixes #885
Put our winged Int16 writing into function
Move midipipe messages out of net
Pass working directory to CreateProcess
Move bytes_written declaration to top
WriteFile requires 4th parameter
Improve version mismatch error
Pass sample rate to midiproc
Merge remote-tracking branch 'me/chocolate-midivolume' into chocolate-midivolume
.gitignore: Ignore PNG screenshot file patterns
bash-completion: Use autoconf substitutions for the chocolate name
NES30 in USB mode and FC30 variants
Add NES30 to known joysticks
Fix error message for PNG screenshots
Merge pull request #739 from jmtd/sdl2-fix-window-position-hexen
hexen: honour window_position during start-up
Merge remote-tracking branch 'chungy/chocolate-midivolume' into chocolate-midivolume
midiproc: Change name to @PROGRAM_PREFIX@midiproc in automake
Support for Watcom C
Add midiproc to the automake system.
Compare against time delta in expect loop
Close client copies of inherited handles
Wrap midi_server_registered check in _WIN32
Free resources that we use
Don't enable vsync for -timedemo mode
Merge pull request #869 from linguica/patch-2
Do not start MIDI server when Timidity is in use
Add flag to activate vsync.
Merge remote-tracking branch 'jmtd/gh-832-vga-porch-emu' into sdl2-branch
VGA porch emulation: make optional
Merge pull request #855 from chocolate-doom/integer_scaling
midiproc now compiles with no /W4 warnings
Add server shutdown and music overrides
Remove remnants of original IDL implementation
I_MidiSocket -> I_MidiPipe
Whoops, forgot to update midiproc packet types
Second attempt, this time with pipes
VGA Porch border emulation
Implement buffer reader functions
Missing header, tidy up code
Implement a buffer for the TCP stream to go into
osx: Tweak colors of command line args box.
Add my name to midisocket file headers
First attempt at MidiSocket client
Normalize header comments and file extensions
Initial version of MidiRPC from Eternity
win32: Strip DLLs as well as EXEs.
Merge pull request #861 from JNechaevsky/sdl2-branch