[chocolate-doom] 02/08: Merge tag 'upstream/2.3.0'
Fabian Greffrath
fabian at moszumanska.debian.org
Fri Dec 30 14:20:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
fabian pushed a commit to branch master
in repository chocolate-doom.
commit 2e002d6b98950e1c91061d3dafe2d85aca91804e
Merge: d959192 9aff3e9
Author: Fabian Greffrath <fabian at debian.org>
Date: Thu Dec 29 21:25:33 2016 +0100
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
.github/CONTRIBUTING.md | 98 ++
.gitignore | 1 +
.travis.yml | 30 +
AUTHORS | 3 +
CODE_OF_CONDUCT.md | 74 +
HACKING => HACKING.md | 124 +-
Makefile.am | 26 +-
NEWS | 1115 -------------
NEWS.md | 1193 ++++++++++++++
NOT-BUGS => NOT-BUGS.md | 94 +-
PHILOSOPHY => PHILOSOPHY.md | 128 +-
README.Music => README.Music.md | 97 +-
README.Strife => README.Strife.md | 73 +-
README => README.md | 42 +-
TODO | 56 -
TODO.md | 36 +
codeblocks/config.h | 6 +-
codeblocks/game-res.rc | 10 +-
codeblocks/libopl.cbp | 4 -
codeblocks/setup-res.rc | 8 +-
configure.ac | 44 +-
man/INSTALL.template | 5 +-
man/Makefile.am | 4 +-
man/bash-completion/.gitignore | 4 +
man/bash-completion/Makefile.am | 44 +
man/bash-completion/doom.template | 51 +
man/bash-completion/heretic.template | 48 +
man/bash-completion/hexen.template | 42 +
man/bash-completion/strife.template | 48 +
man/docgen | 34 +-
msvc/.gitignore | 4 +
msvc/config.h | 6 +-
msvc/doom.vcproj | 8 +
msvc/heretic.vcproj | 8 +
msvc/hexen.vcproj | 9 +
msvc/libopl.vcproj | 12 +-
msvc/strife.vcproj | 8 +
msvc/win32.rc | 8 +-
opl/Makefile.am | 2 +-
opl/dbopl.c | 1638 -------------------
opl/dbopl.h | 203 ---
opl/opl.c | 4 +-
opl/opl3.c | 1415 +++++++++++++++++
opl/opl3.h | 135 ++
opl/opl_linux.c | 4 +-
opl/opl_queue.c | 2 +-
opl/opl_sdl.c | 37 +-
pkg/config.make.in | 9 +-
pkg/osx/AppController.m | 5 +
pkg/osx/Execute.m | 4 +
pkg/osx/GNUmakefile | 7 +-
pkg/osx/Info.plist.in | 12 +
pkg/win32/GNUmakefile | 8 +-
rpm.spec.in | 10 +-
src/.gitignore | 2 +
src/Makefile.am | 15 +-
src/d_iwad.c | 60 +-
src/d_loop.c | 82 +
src/d_loop.h | 7 +
src/d_mode.c | 5 +-
src/d_mode.h | 10 +
src/deh_io.c | 2 +-
src/doom.appdata.xml.in | 8 +-
src/doom/am_map.c | 41 +-
src/doom/d_main.c | 176 +-
src/doom/doomstat.c | 1 +
src/doom/doomstat.h | 4 +-
src/doom/f_finale.c | 18 +-
src/doom/f_wipe.c | 12 +-
src/doom/g_game.c | 143 +-
src/doom/hu_stuff.c | 61 +-
src/doom/m_menu.c | 149 +-
src/doom/m_random.c | 20 +-
src/doom/m_random.h | 3 +-
src/doom/p_doors.c | 7 +
src/doom/p_enemy.c | 12 +-
src/doom/p_map.c | 8 +-
src/doom/p_mobj.c | 18 +-
src/doom/p_pspr.c | 10 +-
src/doom/p_saveg.c | 5 +-
src/doom/p_saveg.h | 3 +
src/doom/p_setup.c | 12 +-
src/doom/p_spec.c | 2 +-
src/doom/p_user.c | 2 +-
src/doom/r_bsp.c | 14 +-
src/doom/r_data.c | 6 +-
src/doom/r_draw.c | 4 +-
src/doom/r_main.c | 4 +-
src/doom/r_segs.c | 4 +-
src/doom/r_sky.c | 2 +-
src/doom/r_things.c | 18 +-
src/doom/s_sound.c | 94 +-
src/doom/st_stuff.c | 84 +-
src/doom/statdump.c | 712 ++++-----
src/doom/statdump.h | 46 +-
src/doom/wi_stuff.c | 6 +-
src/doomtype.h | 9 +-
src/gusconf.c | 39 +-
src/heretic.appdata.xml.in | 8 +-
src/heretic/am_map.c | 26 +-
src/heretic/d_main.c | 17 +-
src/heretic/d_net.c | 16 +-
src/heretic/doomdef.h | 8 +
src/heretic/g_game.c | 235 ++-
src/heretic/m_random.c | 6 +
src/heretic/m_random.h | 3 +
src/heretic/p_enemy.c | 74 +-
src/heretic/p_inter.c | 6 +-
src/heretic/p_map.c | 4 +-
src/heretic/p_mobj.c | 24 +-
src/heretic/p_pspr.c | 20 +-
src/heretic/p_saveg.c | 50 +-
src/heretic/p_user.c | 2 +-
src/heretic/r_bsp.c | 14 +-
src/heretic/r_data.c | 6 +-
src/heretic/r_things.c | 12 +-
src/heretic/s_sound.c | 19 +-
src/hexen.appdata.xml.in | 8 +-
src/hexen/a_action.c | 45 +-
src/hexen/am_map.c | 25 +
src/hexen/d_net.c | 17 +-
src/hexen/g_game.c | 349 +++-
src/hexen/h2_main.c | 19 +-
src/hexen/h2def.h | 29 +-
src/hexen/m_random.c | 6 +
src/hexen/m_random.h | 3 +
src/hexen/mn_menu.c | 12 +
src/hexen/p_acs.c | 17 +
src/hexen/p_enemy.c | 100 +-
src/hexen/p_map.c | 4 +-
src/hexen/p_mobj.c | 35 +-
src/hexen/p_pspr.c | 27 +-
src/hexen/p_spec.h | 1 +
src/hexen/r_bsp.c | 13 +-
src/hexen/r_data.c | 6 +-
src/hexen/r_things.c | 12 +-
src/hexen/s_sound.c | 24 +-
src/hexen/sv_save.c | 1243 ++++++++-------
src/i_joystick.c | 6 +-
src/i_joystick.h | 2 +-
src/i_oplmusic.c | 519 +++---
src/i_pcsound.c | 3 +-
src/i_scale.c | 4 +-
src/i_sdlmusic.c | 4 +-
src/i_sdlsound.c | 180 ++-
src/i_sound.c | 12 +-
src/i_sound.h | 22 +-
src/i_swap.h | 4 +-
src/i_video.c | 149 +-
src/i_video.h | 3 +-
src/m_config.c | 30 +
src/m_controls.c | 2 +
src/m_controls.h | 1 +
src/m_fixed.c | 2 +-
src/m_misc.c | 87 +
src/m_misc.h | 2 +
src/mus2mid.c | 2 +-
src/net_server.c | 5 +-
src/setup/Makefile.am | 4 +-
src/setup/compatibility.c | 9 +-
src/setup/display.c | 8 +-
src/setup/display.h | 1 +
src/setup/joystick.c | 203 ++-
src/setup/keyboard.c | 100 +-
src/setup/mainmenu.c | 19 +-
src/setup/mode.c | 3 +
src/setup/mouse.c | 43 +-
src/setup/multiplayer.c | 137 +-
src/setup/sound.c | 113 +-
src/setup/sound.h | 2 +
src/setup/txt_joyaxis.c | 4 +-
src/setup/txt_joybinput.c | 14 +-
src/strife.appdata.xml.in | 8 +-
src/strife/am_map.c | 28 +-
src/strife/d_main.c | 75 +-
src/strife/g_game.c | 6 +-
src/strife/m_saves.c | 1056 ++++++------
src/strife/m_saves.h | 112 +-
src/strife/p_dialog.c | 2826 ++++++++++++++++-----------------
src/strife/p_dialog.h | 204 +--
src/strife/p_enemy.c | 9 +-
src/strife/p_inter.c | 13 +-
src/strife/p_plats.c | 8 +-
src/strife/p_pspr.c | 2 +-
src/strife/p_spec.c | 2 +-
src/strife/r_bsp.c | 14 +-
src/strife/r_data.c | 6 +-
src/strife/r_things.c | 14 +-
src/strife/s_sound.c | 19 +-
src/tables.c | 4 +-
src/v_diskicon.c | 145 ++
src/{doom/m_random.h => v_diskicon.h} | 27 +-
src/v_video.c | 114 +-
src/w_checksum.c | 8 +-
src/w_file.h | 10 +-
src/w_file_posix.c | 2 +
src/w_file_stdc.c | 1 +
src/w_file_win32.c | 2 +
src/w_main.c | 44 +-
src/w_main.h | 3 +
src/w_merge.c | 65 +-
src/w_wad.c | 252 ++-
src/w_wad.h | 32 +-
src/z_zone.c | 4 +-
textscreen/examples/guitest.c | 15 +-
textscreen/txt_checkbox.c | 2 +-
textscreen/txt_scrollpane.c | 3 +-
textscreen/txt_table.c | 376 ++++-
textscreen/txt_table.h | 52 +-
209 files changed, 10564 insertions(+), 8283 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git
More information about the Pkg-games-commits
mailing list