commit 83a7dfb9af4b8819b6d578044809fc91cc21661a
Merge: b58976aa 52ccdb80
Author: Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Mon Jul 17 13:30:03 2017 +0100
Commit: GitHub <noreply@github.com>
CommitDate: Mon Jul 17 13:30:03 2017 +0100
Merge branch 'sdl2-branch' into chocolate-midivolume
.gitignore | 10 ++
NEWS.md | 8 +-
configure.ac | 13 ++-
data/convert-icon | 9 +-
man/bash-completion/.gitignore | 1 +
.../{doom.template => doom.template.in} | 6 +-
.../{heretic.template => heretic.template.in} | 6 +-
.../{hexen.template => hexen.template.in} | 6 +-
.../{strife.template => strife.template.in} | 6 +-
pkg/osx/Resources/launcher.nib/designable.nib | 17 +--
pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 23622 -> 23971 bytes
src/d_iwad.c | 5 +
src/doom/am_map.c | 4 +-
src/doom/doomdata.h | 32 +++---
src/doom/m_menu.c | 86 +++++++++++---
src/doom/p_setup.c | 4 +-
src/doom/r_data.c | 8 +-
src/doomtype.h | 10 +-
src/heretic/d_main.c | 77 -------------
src/heretic/doomdata.h | 40 +++----
src/hexen/h2_main.c | 2 +-
src/hexen/p_acs.c | 4 +-
src/hexen/xddefs.h | 40 +++----
src/i_oplmusic.c | 12 +-
src/i_video.c | 124 +++++++++++++++------
src/i_video.h | 8 ++
src/i_videohr.c | 8 +-
src/m_config.c | 12 ++
src/midifile.c | 8 +-
src/mus2mid.c | 4 +-
src/resource.rc.in | 2 +
src/setup/display.c | 9 ++
src/setup/joystick.c | 105 +++++++++++++++--
src/setup/txt_joyaxis.c | 10 +-
src/strife/doomdata.h | 32 +++---
src/strife/m_saves.c | 2 +
src/strife/p_setup.c | 4 +-
src/strife/r_data.c | 8 +-
src/v_patch.h | 20 ++--
src/v_video.c | 15 ++-
src/w_wad.c | 8 +-
textscreen/txt_fileselect.c | 59 +++++++++-
textscreen/txt_window.c | 1 +
43 files changed, 550 insertions(+), 295 deletions(-)
diff --cc configure.ac
index 1f9c024f,77a7db69..05e83b78
--- a/configure.ac
+++ b/configure.ac
@@@ -151,7 -152,10 +152,11 @@@ AC_OUTPUT(
Makefile
man/Makefile
man/bash-completion/Makefile
+ man/bash-completion/doom.template
+ man/bash-completion/heretic.template
+ man/bash-completion/hexen.template
+ man/bash-completion/strife.template
+midiproc/Makefile
opl/Makefile
opl/examples/Makefile
pcsound/Makefile