[openjk] 31/32: Merge tag 'upstream/0_20170312+dfsg1' into debian/master

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 7871b8fcba8f88a31da4cf7633515a953d3a4af6
Merge: 34554f9 5acab4f
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Mar 12 16:09:41 2017 +0000

    Merge tag 'upstream/0_20170312+dfsg1' into debian/master
    
    Upstream version 0~20170312+dfsg1

 CMakeLists.txt                                   |  13 +++
 appveyor.yml                                     |  15 ++-
 code/cgame/cg_main.cpp                           |   4 +-
 code/client/cl_main.cpp                          |   1 +
 code/client/snd_mem.cpp                          |   6 +-
 code/client/snd_music.cpp                        |   2 +-
 code/game/Q3_Interface.cpp                       |   2 +-
 code/game/g_client.cpp                           |   6 +-
 code/game/g_main.cpp                             |   4 +-
 code/game/wp_saberLoad.cpp                       |   2 +-
 code/qcommon/cm_test.cpp                         |   2 +-
 code/qcommon/common.cpp                          |   8 +-
 code/rd-common/mdx_format.h                      |   2 +-
 code/rd-common/tr_public.h                       |   3 +-
 code/rd-vanilla/tr_ghoul2.cpp                    |   4 +-
 code/rd-vanilla/tr_init.cpp                      |  30 ++----
 code/rd-vanilla/tr_shader.cpp                    |  19 ++++
 code/ui/ui_main.cpp                              | 130 +++++++++++++++++------
 code/ui/ui_shared.cpp                            |  28 ++++-
 code/ui/ui_shared.h                              |   8 ++
 codeJK2/cgame/animtable.h                        |   2 +-
 codeJK2/cgame/cg_main.cpp                        |   4 +-
 codeJK2/game/AI_Utils.cpp                        |   4 +-
 codeJK2/game/NPC.cpp                             |   4 -
 codeJK2/game/Q3_Interface.cpp                    |   8 +-
 codeJK2/game/g_client.cpp                        |   6 +-
 codeJK2/game/g_main.cpp                          |   4 +-
 codemp/botlib/l_precomp.cpp                      |   2 +-
 codemp/cgame/cg_ents.c                           |   2 +-
 codemp/cgame/cg_local.h                          |   2 +-
 codemp/cgame/cg_servercmds.c                     |   4 +-
 codemp/client/cl_main.cpp                        |   1 +
 codemp/client/snd_mem.cpp                        |   6 +-
 codemp/client/snd_music.cpp                      |   2 +-
 codemp/game/NPC.c                                |   4 -
 codemp/game/bg_panimate.c                        |   2 +-
 codemp/game/g_main.c                             |   6 +-
 codemp/game/g_mem.c                              |   7 +-
 codemp/game/g_xcvar.h                            |   2 +-
 codemp/qcommon/common.cpp                        |   8 +-
 codemp/qcommon/md5.cpp                           |   2 +-
 codemp/rd-common/mdx_format.h                    |   2 +-
 codemp/rd-common/tr_image_png.cpp                |  11 +-
 codemp/rd-common/tr_public.h                     |   3 +-
 codemp/rd-vanilla/G2_API.cpp                     |  77 ++++++--------
 codemp/rd-vanilla/tr_init.cpp                    |  29 ++---
 codemp/rd-vanilla/tr_shader.cpp                  |  21 +++-
 codemp/ui/ui_cvar.c                              |  60 ++++++++++-
 codemp/ui/ui_shared.c                            |  26 ++++-
 codemp/ui/ui_shared.h                            |   7 ++
 codemp/ui/ui_xcvar.h                             |   1 +
 documentation/developer/renderer-architecture.md |  11 ++
 shared/qcommon/q_platform.h                      |   5 +
 shared/sdl/sdl_window.cpp                        |   5 +
 shared/sys/sys_public.h                          |   1 +
 55 files changed, 423 insertions(+), 207 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git