foxygit / doom Log in 
commit fbc9b30c1033e63e0af5b31cef5a7eab95e428dc
Merge: 0083adaa 37d108a5
Author:     Thomas A. Birkel <capnclever@gmail.com>
AuthorDate: Thu Dec 1 01:12:13 2016 -0500
Commit:     Thomas A. Birkel <capnclever@gmail.com>
CommitDate: Thu Dec 1 01:12:13 2016 -0500

    Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into commandline-savedir

 NEWS.md              | 116 ++++++++++++++++++++++-------------------
 PHILOSOPHY.md        |  40 ++++++++++-----
 README.md            |   2 +-
 configure.ac         |   3 +-
 src/d_iwad.c         |  27 ++++++----
 src/d_loop.c         |  82 +++++++++++++++++++++++++++++
 src/d_loop.h         |   7 +++
 src/doom/d_main.c    |  26 +++++-----
 src/doom/g_game.c    |  46 +++++++++--------
 src/heretic/g_game.c |  44 +++++++++++-----
 src/hexen/g_game.c   | 142 ++++++++++++++++++++++++++++++---------------------
 src/hexen/p_acs.c    |   2 -
 src/hexen/sv_save.c  |   5 +-
 src/m_misc.c         |  87 +++++++++++++++++++++++++++++++
 src/m_misc.h         |   2 +
 src/w_file.h         |  10 ++--
 src/w_file_posix.c   |   2 +
 src/w_file_stdc.c    |   1 +
 src/w_file_win32.c   |   2 +
 19 files changed, 452 insertions(+), 194 deletions(-)