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
.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
Support for Watcom C
Don't enable vsync for -timedemo mode
Merge pull request #869 from linguica/patch-2
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
VGA Porch border emulation
osx: Tweak colors of command line args box.
win32: Strip DLLs as well as EXEs.
Merge pull request #861 from JNechaevsky/sdl2-branch
video: Query SDL API for maximum texture size.
video: Bump default pixel limit to 16M pixels.
video: Add config variable for texture pixel limit.
win32: Add cp-with-libs to dist.
Add option to force integer scales for resolution-independent rendering
Bump version to 3.0.0-beta1.
setup: Adjust position of display config window.
d_iwad: Find Doom 3: BFG IWADs on Unix systems.
Merge remote-tracking branch 'origin/master' into sdl2-branch
NEWS: Add initial notes for 3.0 release.
copyright.ac: update copyright years
Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch
textscreen: Activate window for file select.
setup: Add control for music pack config.
setup: Simplify by using TXT_MakeTable().
textscreen: Add TXT_MakeTable().
music: Add config variable for music packs path.
win32: Ignore staging and zip files.
Remove doomfeatures.h and "features" compiles.
win32: Make cp-with-libs python3 compatible.
win32: Auto-determine DLL path from LDFLAGS.
textscreen: Minor cleanups.
textscreen: Make UTF8 the rule, not the exception.
textscreen: Add Italian window.
setup: Use UTF-8 for textscreen strings.
textscreen: Change most strings to UTF-8.
textscreen: Very minor fix to code page.
textscreen: Refactor code page mapping.
man: make scripts Python2 compatible again.
textscreen: Tweak TXT_GetKeyDescription() again.
setup: Print key names as UTF8.
man: Make sure to add new lines in the last commit.
man/{docgen,simplecpp}: Force UTF-8 reading and writing regardless of locale
video: Always grab mouse when exiting main menu.
win32: Add cp-with-libs script for Win32 package.
Merge remote-tracking branch 'origin/master' into sdl2-branch
osx: Use bzip2 compression for .dmg files.
INSTALL: Fix .lha filename extension.
Merge pull request #838 from chocolate-doom/pixel_t
introduce a pixel_t type
video: Grab window move events and save display.
video: Add video_display config option.
Rearrange entries for extra config file.
setup: Fix the pairing of Hexen player classes and skill levels.
Revert "Link MinGW builds with static libgcc"
strife: Fix compiler warning.
Link MinGW builds with static libgcc
Merge pull request #749 from nukeykt/retailfix
hexen: Remove tab character added in previous commit
Merge pull request #823 from CapnClever/commandline-savedir
Merge branch 'master' into commandline-savedir
pcsound: Remove Win9x TODO().
README.Music: Remove reference to Win9x.
Merge remote-tracking branch 'origin/master' into sdl2-branch
Bump version number to 2.3.0, update NEWS.