[openjk] 03/15: Merge tag 'upstream/0_20150731+dfsg1'
Simon McVittie
smcv at debian.org
Wed Oct 7 07:36:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 5ad277b89028ad6d45468a990833a28b250289d7
Merge: 39cd86b d22ff89
Author: Simon McVittie <smcv at debian.org>
Date: Sat Aug 1 21:00:57 2015 +0100
Merge tag 'upstream/0_20150731+dfsg1'
Upstream version 0~20150731+dfsg1
CMakeLists.txt | 84 ++++++++------
CMakeModules/InstallZIP.cmake | 21 ++++
CMakeModules/Toolchains/linux-i686.cmake | 5 +
CreateVisualStudio2015Projects.bat | 18 +++
code/CMakeLists.txt | 9 +-
code/Ratl/handle_pool_vs.h | 14 +--
code/Ratl/map_vs.h | 17 +--
code/Ratl/pool_vs.h | 14 +--
code/Ratl/queue_vs.h | 7 --
code/Ratl/ratl_common.h | 18 ---
code/Ratl/stack_vs.h | 4 -
code/Ratl/vector_vs.h | 4 -
code/Rufl/hfile.cpp | 2 +-
code/Rufl/hstring.cpp | 2 +-
code/cgame/cg_draw.cpp | 3 +
code/client/cl_ui.cpp | 2 +
code/client/snd_ambient.cpp | 7 +-
code/client/snd_ambient.h | 18 ---
code/client/snd_dma.cpp | 9 +-
code/client/snd_local.h | 2 +-
code/client/vmachine.cpp | 4 +-
code/game/CMakeLists.txt | 11 +-
code/game/g_utils.cpp | 6 -
code/game/g_vehicles.cpp | 9 +-
code/game/genericparser2.h | 3 -
code/game/ghoul2_shared.h | 15 ---
code/ghoul2/ghoul2_gore.h | 5 -
code/icarus/IcarusImplementation.h | 9 --
code/icarus/StdAfx.h | 8 --
code/mp3code/cdct.c | 4 -
code/mp3code/config.h | 2 -
code/mp3code/csbtb.c | 3 -
code/mp3code/csbtl3.c | 3 -
code/mp3code/cup.c | 6 -
code/mp3code/cupini.c | 10 --
code/mp3code/cupl1.c | 4 -
code/mp3code/cwin.c | 39 +++----
code/mp3code/cwinb.c | 3 -
code/mp3code/cwinm.c | 6 -
code/mp3code/l3dq.c | 8 --
code/mp3code/l3init.c | 14 +--
code/mp3code/mhead.h | 4 -
code/mp3code/mp3struct.h | 9 --
code/mp3code/uph.c | 7 --
code/mp3code/wavep.c | 3 -
code/qcommon/common.cpp | 7 --
code/qcommon/msg.cpp | 2 +-
code/qcommon/q_math.cpp | 189 +++++++++++++++----------------
code/qcommon/q_platform.h | 49 +++-----
code/qcommon/q_shared.h | 27 ++---
code/qcommon/stringed_ingame.cpp | 6 -
code/qcommon/stringed_interface.cpp | 6 -
code/qcommon/stringed_interface.h | 3 -
code/qcommon/strip.cpp | 16 ---
code/rd-common/tr_font.cpp | 2 -
code/rd-vanilla/CMakeLists.txt | 11 +-
code/rd-vanilla/G2_API.cpp | 30 +----
code/rd-vanilla/G2_misc.cpp | 4 -
code/rd-vanilla/G2_surfaces.cpp | 4 -
code/rd-vanilla/tr_WorldEffects.cpp | 7 --
code/rd-vanilla/tr_image.cpp | 7 --
code/rd-vanilla/tr_local.h | 5 +-
code/rd-vanilla/tr_shade_calc.cpp | 7 --
code/rd-vanilla/tr_skin.cpp | 8 +-
code/rd-vanilla/tr_stl.cpp | 17 ---
code/server/sv_savegame.cpp | 6 -
code/ui/ui_local.h | 32 ++++--
code/ui/ui_main.cpp | 150 +++++++++++++++++-------
code/ui/ui_shared.cpp | 8 +-
codeJK2/cgame/cg_draw.cpp | 3 +
codeJK2/game/CMakeLists.txt | 13 +--
codeJK2/icarus/BlockStream.cpp | 5 -
codeJK2/icarus/blockstream.h | 12 --
codeJK2/icarus/icarus.h | 16 ---
codeJK2/icarus/sequencer.h | 10 --
codemp/CMakeLists.txt | 38 +++----
codemp/Ratl/ratl_common.h | 4 -
codemp/Ratl/vector_vs.h | 4 -
codemp/botlib/be_aas_entity.cpp | 4 +-
codemp/botlib/be_aas_move.cpp | 2 +-
codemp/botlib/be_aas_reach.cpp | 8 +-
codemp/botlib/be_ai_move.cpp | 2 +-
codemp/cgame/CMakeLists.txt | 11 +-
codemp/cgame/cg_ents.c | 2 +-
codemp/cgame/cg_predict.c | 14 ---
codemp/cgame/cg_xcvar.h | 1 -
codemp/client/FxScheduler.cpp | 2 +-
codemp/client/FxScheduler.h | 6 -
codemp/client/cl_main.cpp | 2 +-
codemp/client/snd_ambient.cpp | 7 +-
codemp/client/snd_ambient.h | 20 ----
codemp/client/snd_dma.cpp | 4 +
codemp/client/snd_local.h | 2 +-
codemp/client/snd_mix.cpp | 2 +-
codemp/client/snd_music.cpp | 19 +---
codemp/game/CMakeLists.txt | 11 +-
codemp/game/g_cmds.c | 2 +-
codemp/game/g_local.h | 2 +
codemp/game/g_main.c | 7 ++
codemp/game/g_vehicles.c | 8 +-
codemp/ghoul2/G2_gore.h | 5 -
codemp/ghoul2/ghoul2_shared.h | 13 ---
codemp/icarus/BlockStream.cpp | 6 -
codemp/icarus/blockstream.h | 12 --
codemp/icarus/icarus.h | 18 ---
codemp/icarus/sequencer.h | 12 --
codemp/icarus/tokenizer.h | 10 --
codemp/mp3code/cdct.c | 4 -
codemp/mp3code/config.h | 2 -
codemp/mp3code/csbtb.c | 3 -
codemp/mp3code/csbtl3.c | 3 -
codemp/mp3code/cup.c | 5 -
codemp/mp3code/cupini.c | 9 --
codemp/mp3code/cupl1.c | 4 -
codemp/mp3code/cwin.c | 39 +++----
codemp/mp3code/cwinb.c | 3 -
codemp/mp3code/cwinm.c | 6 -
codemp/mp3code/l3dq.c | 8 --
codemp/mp3code/l3init.c | 14 +--
codemp/mp3code/mhead.h | 5 -
codemp/mp3code/mp3struct.h | 9 --
codemp/mp3code/uph.c | 7 --
codemp/mp3code/wavep.c | 3 -
codemp/qcommon/RoffSystem.cpp | 16 +--
codemp/qcommon/RoffSystem.h | 6 -
codemp/qcommon/cm_load.cpp | 25 +++-
codemp/qcommon/common.cpp | 9 +-
codemp/qcommon/files.cpp | 2 +-
codemp/qcommon/msg.cpp | 2 +-
codemp/qcommon/q_platform.h | 45 ++------
codemp/qcommon/stringed_ingame.cpp | 10 --
codemp/qcommon/stringed_interface.cpp | 6 -
codemp/qcommon/stringed_interface.h | 3 -
codemp/rd-common/tr_types.h | 3 -
codemp/rd-dedicated/G2_API.cpp | 7 --
codemp/rd-dedicated/G2_misc.cpp | 8 --
codemp/rd-dedicated/G2_surfaces.cpp | 3 -
codemp/rd-dedicated/tr_ghoul2.cpp | 3 -
codemp/rd-dedicated/tr_local.h | 3 -
codemp/rd-dedicated/tr_model.cpp | 10 +-
codemp/rd-dedicated/tr_skin.cpp | 7 +-
codemp/rd-vanilla/CMakeLists.txt | 11 +-
codemp/rd-vanilla/G2_API.cpp | 7 --
codemp/rd-vanilla/G2_misc.cpp | 10 +-
codemp/rd-vanilla/G2_surfaces.cpp | 3 -
codemp/rd-vanilla/qgl.h | 10 ++
codemp/rd-vanilla/tr_WorldEffects.cpp | 6 -
codemp/rd-vanilla/tr_arb.cpp | 64 +++++++++--
codemp/rd-vanilla/tr_backend.cpp | 57 +++++++++-
codemp/rd-vanilla/tr_cmds.cpp | 17 +--
codemp/rd-vanilla/tr_ghoul2.cpp | 3 -
codemp/rd-vanilla/tr_image.cpp | 109 +++++++++++++-----
codemp/rd-vanilla/tr_init.cpp | 51 ++++++++-
codemp/rd-vanilla/tr_local.h | 14 ++-
codemp/rd-vanilla/tr_model.cpp | 10 +-
codemp/rd-vanilla/tr_scene.cpp | 4 -
codemp/rd-vanilla/tr_shader.cpp | 2 +-
codemp/server/NPCNav/navigator.cpp | 13 ---
codemp/server/NPCNav/navigator.h | 4 -
codemp/server/sv_ccmds.cpp | 104 +++++++++++++++--
codemp/server/sv_world.cpp | 7 +-
codemp/ui/CMakeLists.txt | 11 +-
codemp/ui/ui_local.h | 31 +++--
codemp/ui/ui_main.c | 147 +++++++++++++++---------
codemp/ui/ui_shared.c | 6 +
shared/sdl/sdl_input.cpp | 6 +-
shared/sdl/sdl_window.cpp | 11 +-
167 files changed, 1041 insertions(+), 1346 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list