commit d36dafa3fc3457333f1c49ce133c1e2587e778d4
Merge: d8cfdba5 76071402
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Jun 4 19:36:32 2016 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Jun 4 19:36:32 2016 -0400
Merge remote-tracking branch 'origin/master' into sdl2-branch
.github/CONTRIBUTING.md | 5 ++++
AUTHORS | 3 +-
CODE_OF_CONDUCT.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++
NEWS | 63 +++++++++++++++++++++++++++++++++++++++
NOT-BUGS | 6 ++--
README | 2 +-
README.Music | 4 +--
configure.ac | 2 +-
man/INSTALL.template | 5 ++--
msvc/.gitignore | 3 ++
opl/opl_sdl.c | 2 --
pkg/osx/AppController.m | 5 ++++
pkg/osx/Info.plist.in | 12 ++++++++
rpm.spec.in | 2 +-
src/Makefile.am | 2 +-
src/d_iwad.c | 8 +++++
src/d_mode.h | 10 +++++++
src/doom.appdata.xml.in | 8 ++---
src/doom/d_main.c | 56 ++++++++++++++++++++---------------
src/doom/doomstat.c | 1 +
src/doom/doomstat.h | 4 +--
src/doom/g_game.c | 3 +-
src/doom/m_random.c | 15 +---------
src/doom/p_mobj.c | 12 ++++++++
src/gusconf.c | 38 ++++++++++++++++++++----
src/heretic.appdata.xml.in | 8 ++---
src/heretic/am_map.c | 6 +++-
src/hexen.appdata.xml.in | 8 ++---
src/hexen/h2_main.c | 2 +-
src/mus2mid.c | 2 +-
src/setup/Makefile.am | 2 --
src/setup/compatibility.c | 2 +-
src/setup/display.c | 2 +-
src/setup/joystick.c | 2 +-
src/setup/keyboard.c | 2 +-
src/setup/mainmenu.c | 2 +-
src/setup/mouse.c | 2 +-
src/setup/multiplayer.c | 8 ++---
src/setup/sound.c | 2 +-
src/strife.appdata.xml.in | 8 ++---
src/strife/am_map.c | 5 ++--
src/strife/d_main.c | 65 ++++++++++++++++++++--------------------
src/strife/g_game.c | 3 +-
src/strife/p_enemy.c | 9 ++++--
src/strife/p_inter.c | 10 +++----
src/strife/p_pspr.c | 2 +-
46 files changed, 358 insertions(+), 139 deletions(-)