Merge branch 'master' into sdl2-branch
Merge branch 'master' into sdl2-branch
Merge pull request #615 from Gaerzi/patch-1
Allow binding jump to mouse button in Strife
Merge branch 'sdl2-branch' of https://github.com/chocolate-doom/chocolate-doom into sdl2-branch
Video: Vast improvements to the CreateUpscaledTexture() algorithm
Merge pull request #614 from Azarien/upstream_sdl2
VS2008 does not support designated initializers
Update VS project files for SDL2
Fixed Heretic / Hexen vcproj files
Added deh_bexstr.c to MSVC project
Make sure the pillarboxes are kept clear each frame
use SDL_LowerBlit() instead of SDL_BlitSurface()
create a new texture only if the upscale factor has changed
Video: In fullscreen mode, use desktop dimensions to calculate texture size
Video: Implement adaptive scaling of the upscaled texture
video: implement hardware rendering with proper intermediate upscaling
Merge pull request #611 from linguica/master
Merge remote-tracking branch 'chocolate-doom/master'
Add error message to untagged DR tag crash
Bump version number to 2.2.1 and add NEWS about it
Merge pull request #610 from Azarien/upstream_patch
Ensure the buffer is zero-terminated.
Merge pull request #607 from chungy/strife-screensize
setup: Strife uses screensize 10 by default. closes #462
Merge remote-tracking branch 'chocolate-doom/master'
configure: Check for windres only if building for windows
Merge pull request #556 from chungy/appdata
Merge pull request #601 from chungy/gog.com
Merge pull request #602 from jmtd/clang-fixups
d_iwad: change "gogcom_collectors_edition" to "root_path"
Adjust PACKEDATTR for Clang
Search GOG.com installation directories for IWADs
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
Apply gcc_struct tag to packed structs
man: Add documentation for IWAD search paths.
Make IWAD search paths compliant with XDG spec.
wad: Move W_CheckCorrectIWAD() into w_main.c.
wad: Change type of lumpinfo[] array.
wad: Free cached lumps on reload, don't release.
doom: Fix compiler warnings due to type conflict.
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Remove duplicate variable definitions.
Merge pull request #596 from chungy/master
setup-manifest: Add compatibility GUID for Windows 10
Revert "Use the screen's native pixel format for the texture"
Use the screen's native pixel format for the texture
Do not change surface blend modes
Revert "Video: Use intended function sequence to update "streaming" texture"
doom: Fix formatting in ST_Responder().
Merge pull request #593 from khokh2001/chex
doom:Chex's warp cheat handling fix
doom:Chex's map name handling fix
opl: Add a secret DMXOPTION to reverse stereo channels.
Merge pull request #592 from linguica/msvc-fixes
Fixed Heretic / Hexen vcproj files
Merge pull request #590 from linguica/patch-1
Added deh_bexstr.c to MSVC project
Merge pull request #588 from jmtd/text-segv
Add constraint check to CellOverflowedSize
Merge pull request #589 from Azarien/upstream_master
Merge pull request #582 from khokh2001/doom-1.666
Expanded table of valid game versions.
Merge pull request #581 from khokh2001/doom-1.666
setup: Update to add new defaults.
Merge pull request #580 from jmtd/aspect-ratio-screenshots
Write out aspect-corrected 1600x1200 PNGs
Merge pull request #577 from jkbenaim/master
Configure: Set minimum required SDL2 version to 2.0.2
Video: Add another intermediate upscaled RGBA buffer
osx: Add CFBundleIdentifier to Info.plist.
textscreen: Fix struct initializers.
textscreen: Allow cycling through tables with tab key.
setup: Clean up gamepad configuration window.
doom: Avoid overflow for spawn angle calculation.
setup: Clean up multiplayer dialog code.
setup: Simplify mouse configuration window code.
setup: Clean up the keyboard controls window.
setup: Clean up the sound configuration window.
textscreen: Fix separator special case handling.
textscreen: Add TXT_SetTableColumns() function.
textscreen: Add further table conveniences.
textscreen: Add table cell overflowing.
Fix formatting issues introduced in last merge.
Merge pull request #567 from jmtd/pitch-shifting
Enable pitch-shifting in Hexen
Default snd_pitchshift on for Heretic/Hexen
setup: Fix population of extra_table.
snd_pitchshift defaults off, except Raven games
Immediately free pitch-shifted sound effects
Make pitch-shifting optional (default to off)
Implement approximation of Doom's pitching
Introduce pitch to allocated_sound_t
rework AllocateSound to return allocated_sound_t
Replace ->driver_data with GetAllocatedSoundBySfxinfo
Switch channels_playing to track allocated_sound_t