commit 42b0bec923796ed30a8cd583d1fccecbe89e1de8
Merge: 03b6f175 253d9ba1
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Sep 7 18:44:27 2024 -0400
Commit: GitHub <noreply@github.com>
CommitDate: Sat Sep 7 18:44:27 2024 -0400
Merge branch 'master' into 1.5compat
.github/workflows/cpp-linter.yml | 7 +-
.github/workflows/cppcheck.yml | 4 +-
.github/workflows/main.yml | 153 +++++++++-
.github/workflows/msys2.yml | 72 -----
CMakeLists.txt | 4 +-
NEWS.md | 107 ++++++-
PHILOSOPHY.md | 2 +-
RELEASE_NOTES.md | 172 +++++++++++
configure.ac | 21 +-
man/INSTALL.template | 4 +-
man/bash-completion/hexen.template.in | 3 +
man/docgen | 24 +-
man/extra.cfg.template | 30 +-
opl/opl_sdl.c | 2 +-
pcsound/pcsound_sdl.c | 5 +-
pkg/Makefile.am | 2 +-
pkg/config.make.in | 2 +
pkg/osx/GNUmakefile | 9 +-
pkg/osx/cp-with-libs | 11 +-
pkg/style.html | 48 ++++
pkg/win32/GNUmakefile | 28 +-
quickcheck | 2 +-
src/Doom.metainfo.xml.in | 12 +
src/Heretic.metainfo.xml.in | 1 +
src/Hexen.metainfo.xml.in | 1 +
src/Strife.metainfo.xml.in | 1 +
src/d_event.h | 3 +-
src/d_mode.c | 1 +
src/d_mode.h | 1 +
src/doom/am_map.c | 4 -
src/doom/d_main.c | 27 +-
src/doom/g_game.c | 85 ++++--
src/doom/m_menu.c | 27 +-
src/doom/p_mobj.c | 6 +-
src/doom/st_stuff.c | 85 ------
src/doom/st_stuff.h | 20 --
src/heretic/am_map.c | 4 -
src/heretic/d_main.c | 2 +-
src/heretic/doomdef.h | 2 +
src/heretic/g_game.c | 134 +++++++--
src/heretic/mn_menu.c | 146 +++++++++-
src/heretic/p_map.c | 11 +-
src/heretic/p_pspr.c | 2 +-
src/heretic/p_setup.c | 3 +
src/hexen/a_action.c | 4 +-
src/hexen/am_map.c | 4 -
src/hexen/g_game.c | 130 +++++++--
src/hexen/h2_main.c | 81 +++++-
src/hexen/h2def.h | 7 +-
src/hexen/mn_menu.c | 148 +++++++++-
src/hexen/p_enemy.c | 37 ++-
src/hexen/p_setup.c | 4 +
src/i_flmusic.c | 12 +-
src/i_joystick.c | 174 ++++++++++-
src/i_joystick.h | 25 +-
src/i_musicpack.c | 2 +-
src/i_pcsound.c | 15 +-
src/i_sdlmusic.c | 3 +-
src/i_sdlsound.c | 7 +-
src/i_sound.c | 18 +-
src/i_sound.h | 6 +-
src/i_system.c | 18 +-
src/i_video.c | 12 +-
src/i_winmusic.c | 524 ++++++++++++++++++++++------------
src/m_argv.c | 28 +-
src/m_config.c | 115 ++++++++
src/m_controls.c | 16 ++
src/m_controls.h | 8 +
src/net_query.c | 1 +
src/net_server.c | 54 +++-
src/setup/joystick.c | 104 ++++++-
src/setup/sound.c | 100 +++----
src/setup/txt_joybinput.c | 6 +
src/strife/am_map.c | 4 -
src/strife/d_main.c | 13 +-
src/strife/g_game.c | 86 ++++--
src/strife/m_menu.c | 57 +++-
src/strife/p_enemy.c | 37 ++-
src/strife/p_mobj.c | 6 +-
src/strife/st_stuff.c | 7 -
src/strife/st_stuff.h | 20 --
textscreen/txt_sdl.c | 30 +-
82 files changed, 2457 insertions(+), 756 deletions(-)