This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit ee44072e39ebd36af40e994471f1fdb224a9548a Merge: 6b25efe 8b1d49d Author: Simon McVittie <s...@debian.org> Date: Fri Oct 28 10:57:03 2016 +0100 Merge tag 'upstream/0_20161025+dfsg1' into debian/master Upstream version 0~20161025+dfsg1 CMakeLists.txt | 3 +- appveyor.yml | 21 +- code/CMakeLists.txt | 12 +- code/cgame/FxPrimitives.cpp | 2 +- code/cgame/FxScheduler.cpp | 29 +- code/cgame/FxScheduler.h | 25 + code/cgame/FxSystem.h | 20 - code/cgame/FxUtil.cpp | 2 +- code/cgame/cg_consolecmds.cpp | 4 +- code/cgame/cg_effects.cpp | 8 +- code/cgame/cg_main.cpp | 31 +- code/cgame/cg_players.cpp | 14 +- code/cgame/cg_servercmds.cpp | 4 +- code/client/cl_input.cpp | 7 + code/client/cl_main.cpp | 4 +- code/game/CMakeLists.txt | 6 +- code/game/G_Timer.cpp | 49 +- code/game/NPC_spawn.cpp | 2 +- code/game/Q3_Interface.cpp | 121 ++- code/game/Q3_Interface.h | 4 +- code/game/ai.h | 75 +- code/game/b_public.h | 303 ++++++- code/game/bg_public.h | 52 +- code/game/g_local.h | 116 ++- code/game/g_main.cpp | 41 +- code/game/g_objectives.cpp | 15 +- code/game/g_public.h | 16 +- code/game/g_roff.cpp | 42 +- code/game/g_savegame.cpp | 514 ++++++----- code/game/g_shared.h | 881 +++++++++++++++++- code/game/g_svcmds.cpp | 634 ++++++------- code/game/g_vehicles.h | 155 ++++ code/game/g_weapon.cpp | 2 +- code/game/ghoul2_shared.h | 303 ++++++- code/icarus/IcarusImplementation.cpp | 65 +- code/icarus/IcarusInterface.h | 3 +- code/qcommon/cm_load.cpp | 24 +- code/qcommon/md4.cpp | 4 +- code/qcommon/msg.cpp | 11 +- code/qcommon/ojk_i_saved_game.h | 106 +++ code/qcommon/ojk_saved_game.cpp | 972 ++++++++++++++++++++ code/qcommon/ojk_saved_game.h | 193 ++++ code/qcommon/ojk_saved_game_class_archivers.h | 51 ++ code/qcommon/ojk_saved_game_helper.h | 843 +++++++++++++++++ code/qcommon/ojk_saved_game_helper_fwd.h | 321 +++++++ code/qcommon/ojk_scope_guard.h | 58 ++ code/qcommon/q_shared.cpp | 23 +- code/qcommon/q_shared.h | 914 ++++++++++++++++++- code/qcommon/qcommon.h | 12 +- code/rd-common/mdx_format.h | 15 + code/rd-common/tr_common.h | 2 +- code/rd-common/tr_image_jpg.cpp | 16 +- code/rd-common/tr_public.h | 6 +- code/rd-vanilla/CMakeLists.txt | 6 +- code/rd-vanilla/G2_API.cpp | 5 +- code/rd-vanilla/G2_bones.cpp | 1 - code/rd-vanilla/G2_misc.cpp | 226 +++-- code/rd-vanilla/tr_ghoul2.cpp | 32 +- code/rd-vanilla/tr_surface.cpp | 32 +- code/server/sv_game.cpp | 22 +- code/server/sv_savegame.cpp | 1207 ++++++++++--------------- code/server/sv_snapshot.cpp | 6 + code/ui/ui_main.cpp | 57 +- code/ui/ui_shared.cpp | 230 ++++- code/ui/ui_shared.h | 8 +- codeJK2/cgame/FxPrimitives.cpp | 2 +- codeJK2/cgame/FxSystem.h | 20 - codeJK2/cgame/FxUtil.cpp | 2 +- codeJK2/cgame/cg_consolecmds.cpp | 4 +- codeJK2/cgame/cg_effects.cpp | 8 +- codeJK2/cgame/cg_main.cpp | 27 +- codeJK2/cgame/cg_players.cpp | 12 +- codeJK2/cgame/cg_servercmds.cpp | 4 +- codeJK2/cgame/cg_weapons.cpp | 14 +- codeJK2/game/CMakeLists.txt | 6 +- codeJK2/game/G_Timer.cpp | 50 +- codeJK2/game/NPC_spawn.cpp | 2 +- codeJK2/game/Q3_Interface.cpp | 3 +- codeJK2/game/Q3_Registers.cpp | 112 ++- codeJK2/game/ai.h | 74 +- codeJK2/game/anims.h | 26 +- codeJK2/game/b_public.h | 269 +++++- codeJK2/game/bg_public.h | 48 +- codeJK2/game/g_ICARUS.cpp | 4 +- codeJK2/game/g_local.h | 84 +- codeJK2/game/g_main.cpp | 36 +- codeJK2/game/g_objectives.cpp | 15 +- codeJK2/game/g_public.h | 9 +- codeJK2/game/g_roff.cpp | 40 +- codeJK2/game/g_savegame.cpp | 216 +++-- codeJK2/game/g_shared.h | 868 +++++++++++++++++- codeJK2/game/g_svcmds.cpp | 451 +++++---- codeJK2/game/ghoul2_shared.h | 8 +- codeJK2/icarus/Instance.cpp | 107 ++- codeJK2/icarus/Sequence.cpp | 146 ++- codeJK2/icarus/Sequencer.cpp | 88 +- codeJK2/icarus/TaskManager.cpp | 225 ++++- codeJK2/icarus/interface.h | 3 +- codemp/CMakeLists.txt | 2 + codemp/botlib/l_precomp.cpp | 4 +- codemp/cgame/cg_effects.c | 14 +- codemp/client/FxPrimitives.cpp | 2 +- codemp/client/FxScheduler.cpp | 2 +- codemp/client/FxSystem.cpp | 2 +- codemp/client/FxSystem.h | 32 +- codemp/client/FxUtil.cpp | 2 +- codemp/game/ai_main.c | 2 +- codemp/icarus/GameInterface.cpp | 2 +- codemp/icarus/Q3_Interface.cpp | 2 +- codemp/icarus/interface.h | 2 +- codemp/qcommon/md4.cpp | 4 +- codemp/qcommon/qcommon.h | 2 +- codemp/server/sv_challenge.cpp | 2 + codemp/ui/ui_main.c | 11 +- codemp/ui/ui_shared.c | 135 ++- codemp/ui/ui_shared.h | 8 +- shared/qcommon/q_math.c | 48 + shared/qcommon/q_math.h | 26 + shared/qcommon/q_platform.h | 6 +- shared/sys/sys_win32.cpp | 2 +- 120 files changed, 9884 insertions(+), 2399 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits