commit 27b5915111ffbdae97ce0c415157e104ee6f3493
Merge: 350ac122 ad027ef6
Author: Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Thu Mar 26 16:31:57 2015 +0100
Commit: Fabian Greffrath <fabian@greffrath.com>
CommitDate: Thu Mar 26 16:31:57 2015 +0100
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
HACKING | 13 ++-
man/docgen | 2 +
src/d_iwad.c | 2 +-
src/doom/d_main.c | 22 ++--
src/doom/d_player.h | 2 +-
src/doom/p_floor.c | 6 ++
src/doom/p_inter.c | 15 +--
src/doom/p_map.c | 2 +-
src/doom/p_maputl.c | 2 +-
src/doom/st_stuff.c | 11 +-
src/gusconf.c | 2 +-
src/gusconf.h | 2 +-
src/heretic/d_main.c | 16 +--
src/heretic/p_map.c | 2 +-
src/heretic/p_maputl.c | 2 +-
src/hexen/h2_main.c | 19 ++--
src/hexen/p_map.c | 2 +-
src/hexen/p_maputl.c | 2 +-
src/hexen/p_spec.c | 2 +-
src/i_joystick.c | 18 ++--
src/i_sdlmusic.c | 5 +-
src/i_sound.c | 34 +++----
src/i_video.c | 34 +++----
src/m_config.c | 64 ++++++++----
src/m_config.h | 6 +-
src/m_controls.c | 250 +++++++++++++++++++++++-----------------------
src/net_client.c | 6 +-
src/net_server.c | 3 +-
src/net_structrw.c | 2 +-
src/setup/compatibility.c | 4 +-
src/setup/display.c | 26 ++---
src/setup/joystick.c | 18 ++--
src/setup/keyboard.c | 2 +-
src/setup/mode.c | 19 ++--
src/setup/mouse.c | 12 +--
src/setup/multiplayer.c | 4 +-
src/setup/sound.c | 50 +++++-----
src/setup/txt_joyaxis.c | 4 +
src/strife/d_main.c | 33 +++---
src/strife/p_enemy.c | 4 +-
src/strife/p_inter.c | 10 +-
src/strife/p_map.c | 2 +-
src/strife/p_maputl.c | 2 +-
src/strife/s_sound.c | 7 +-
textscreen/txt_io.c | 4 +-
45 files changed, 408 insertions(+), 341 deletions(-)