commit 5c644aea77f8e37f2f39928b2256c9a13cdebb99
Merge: 4d975256 26524bf5
Author: linguica <github@andrewstine.org>
AuthorDate: Sun Sep 6 12:51:31 2015 -0700
Commit: linguica <github@andrewstine.org>
CommitDate: Sun Sep 6 12:51:31 2015 -0700
Merge remote-tracking branch 'chocolate-doom/master'
configure.ac | 16 ++-
man/Makefile.am | 1 +
man/doom.template | 2 +
man/environ.man | 5 +-
man/heretic.template | 2 +
man/hexen.template | 2 +
man/iwad_paths.man | 48 ++++++++
man/strife.template | 2 +
msvc/heretic.vcproj | 4 -
msvc/hexen.vcproj | 8 --
src/.gitignore | 1 +
src/Makefile.am | 19 ++++
src/d_iwad.c | 209 +++++++++++++++++++++++------------
src/deh_io.c | 2 +-
src/doom.appdata.xml.in | 45 ++++++++
src/doom/d_main.c | 10 +-
src/doom/g_game.c | 3 +-
src/doom/hu_stuff.c | 61 +++++++++-
src/doom/r_data.c | 6 +-
src/doom/r_things.c | 14 +--
src/doom/st_stuff.c | 19 +++-
src/doomtype.h | 6 +
src/heretic.appdata.xml.in | 44 ++++++++
src/heretic/d_main.c | 3 +-
src/heretic/g_game.c | 1 -
src/heretic/r_data.c | 6 +-
src/heretic/r_things.c | 12 +-
src/hexen.appdata.xml.in | 44 ++++++++
src/hexen/g_game.c | 1 -
src/hexen/h2_main.c | 3 +-
src/hexen/r_data.c | 6 +-
src/hexen/r_things.c | 12 +-
src/i_oplmusic.c | 20 ++++
src/i_sdlmusic.c | 2 +-
src/setup/mainmenu.c | 2 +-
src/setup/setup-manifest.xml.in | 1 +
src/strife.appdata.xml.in | 45 ++++++++
src/strife/d_main.c | 2 +-
src/strife/g_game.c | 1 -
src/strife/r_data.c | 6 +-
src/strife/r_things.c | 14 +--
src/w_checksum.c | 8 +-
src/w_main.c | 44 +++++++-
src/w_main.h | 3 +
src/w_merge.c | 65 ++++++-----
src/w_wad.c | 238 ++++++++++++++--------------------------
src/w_wad.h | 32 +++---
47 files changed, 738 insertions(+), 362 deletions(-)