commit 6f48bab893205636faf89ade2625b55c90d8c9bd
Merge: 30f853b6 939cbfeb
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Jan 2 14:42:49 2017 +0100
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Jan 2 14:42:49 2017 +0100
Merge remote-tracking branch 'origin/master' into sdl2-branch
NEWS.md | 124 +++++++++-------
PHILOSOPHY.md | 40 +++--
README.md | 2 +-
codeblocks/config.h | 6 +-
codeblocks/game-res.rc | 10 +-
codeblocks/setup-res.rc | 8 +-
configure.ac | 3 +-
msvc/config.h | 6 +-
msvc/win32.rc | 8 +-
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 | 36 +++--
src/heretic/p_enemy.c | 30 ++--
src/hexen/a_action.c | 4 +-
src/hexen/g_game.c | 39 +++--
src/hexen/p_enemy.c | 47 +++---
src/hexen/p_mobj.c | 7 +-
src/hexen/p_pspr.c | 8 +-
src/i_oplmusic.c | 378 +++++++++++++++++++++---------------------------
src/w_file.h | 10 +-
src/w_file_posix.c | 2 +
src/w_file_stdc.c | 1 +
src/w_file_win32.c | 2 +
25 files changed, 522 insertions(+), 410 deletions(-)
diff --cc configure.ac
index d6cfebfc,8bfe377d..554eea63
--- a/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,5 +1,5 @@@
- AC_INIT(Chocolate Doom, 2.999.0, fraggle@gmail.com, chocolate-doom)
-AC_INIT(Chocolate Doom, 2.3.0, chocolate-doom-dev-list@chocolate-doom.org,
++AC_INIT(Chocolate Doom, 2.999.0, chocolate-doom-dev-list@chocolate-doom.org,
+ chocolate-doom)
PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
PACKAGE_SHORTDESC="Conservative source port"