[iortcw] 02/06: Merge tag 'upstream/1.42d+dfsg1'
Simon McVittie
smcv at debian.org
Wed Mar 2 09:16:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository iortcw.
commit c8dbfa58c2061fdab3a9e541918dd4dc01b83132
Merge: a226d3a accea24
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 2 08:18:16 2016 +0000
Merge tag 'upstream/1.42d+dfsg1'
Upstream version 1.42d+dfsg1
MP/Makefile | 133 +-
MP/code/cgame/cg_draw.c | 291 ++++-
MP/code/cgame/cg_drawtools.c | 133 +-
MP/code/cgame/cg_info.c | 15 +
MP/code/cgame/cg_local.h | 9 +-
MP/code/cgame/cg_main.c | 28 +-
MP/code/cgame/cg_newdraw.c | 24 +
MP/code/cgame/cg_scoreboard.c | 30 +-
MP/code/cgame/cg_view.c | 51 +-
MP/code/cgame/cg_weapons.c | 31 +-
MP/code/client/cl_main.c | 6 +-
MP/code/client/cl_scrn.c | 28 +
MP/code/client/client.h | 10 +-
MP/code/game/g_client.c | 2 +-
MP/code/game/g_mover.c | 8 +-
MP/code/qcommon/common.c | 6 +-
MP/code/qcommon/files.c | 491 ++-----
MP/code/qcommon/ioapi.c | 182 ---
MP/code/qcommon/ioapi.h | 75 --
MP/code/qcommon/q_shared.h | 15 +-
MP/code/qcommon/qcommon.h | 18 +-
MP/code/qcommon/unzip.c | 1608 -----------------------
MP/code/rend2/glsl/lightall_fp.glsl | 249 +---
MP/code/rend2/qgl.h | 12 +-
MP/code/rend2/tr_backend.c | 9 +-
MP/code/rend2/tr_bsp.c | 31 +-
MP/code/rend2/tr_extensions.c | 26 +-
MP/code/rend2/tr_glsl.c | 40 +-
MP/code/rend2/tr_image.c | 544 ++++----
MP/code/rend2/tr_image_bmp.c | 6 +-
MP/code/rend2/tr_image_jpg.c | 65 +-
MP/code/rend2/tr_image_pcx.c | 6 +-
MP/code/rend2/tr_image_png.c | 6 +-
MP/code/rend2/tr_image_tga.c | 6 +-
MP/code/rend2/tr_init.c | 9 +-
MP/code/rend2/tr_light.c | 2 +-
MP/code/rend2/tr_local.h | 20 +-
MP/code/rend2/tr_main.c | 2 +-
MP/code/rend2/tr_scene.c | 21 +-
MP/code/rend2/tr_shade.c | 31 +-
MP/code/rend2/tr_shader.c | 86 +-
MP/code/renderer/tr_image_jpg.c | 59 +-
MP/code/renderer/tr_shade.c | 4 +
MP/code/server/sv_bot.c | 2 +-
MP/code/server/sv_client.c | 15 +-
MP/code/server/sv_init.c | 11 -
MP/code/sys/sys_win32.c | 10 +-
MP/code/ui/ui_atoms.c | 23 -
MP/code/ui/ui_local.h | 2 +
MP/code/ui/ui_main.c | 139 +-
MP/code/ui/ui_shared.c | 160 ++-
MP/code/ui/ui_shared.h | 6 +
MP/code/zlib-1.2.8/ioapi.c | 247 ++++
MP/code/zlib-1.2.8/ioapi.h | 213 +++
MP/code/zlib-1.2.8/unzip.c | 2136 +++++++++++++++++++++++++++++++
MP/code/{qcommon => zlib-1.2.8}/unzip.h | 142 +-
MP/misc/wolf128.png | Bin 0 -> 3357 bytes
MP/rend2-readme.txt | 35 +-
README.md | 998 ++++++---------
SP/Makefile | 124 +-
SP/code/cgame/cg_draw.c | 462 +++++--
SP/code/cgame/cg_drawtools.c | 84 +-
SP/code/cgame/cg_ents.c | 4 +
SP/code/cgame/cg_info.c | 2 +-
SP/code/cgame/cg_local.h | 10 +-
SP/code/cgame/cg_main.c | 32 +-
SP/code/cgame/cg_newdraw.c | 39 +-
SP/code/cgame/cg_scoreboard.c | 24 +-
SP/code/cgame/cg_view.c | 51 +-
SP/code/cgame/cg_weapons.c | 31 +-
SP/code/client/client.h | 8 +-
SP/code/game/ai_cast_script_actions.c | 2 +-
SP/code/game/g_client.c | 4 +-
SP/code/game/g_mover.c | 13 +-
SP/code/game/g_save.c | 159 ++-
SP/code/qcommon/files.c | 226 ++--
SP/code/qcommon/ioapi.c | 182 ---
SP/code/qcommon/ioapi.h | 75 --
SP/code/qcommon/q_shared.h | 15 +-
SP/code/qcommon/qcommon.h | 2 +-
SP/code/qcommon/unzip.c | 1608 -----------------------
SP/code/rend2/glsl/lightall_fp.glsl | 249 +---
SP/code/rend2/qgl.h | 12 +-
SP/code/rend2/tr_backend.c | 9 +-
SP/code/rend2/tr_bsp.c | 30 +-
SP/code/rend2/tr_extensions.c | 26 +-
SP/code/rend2/tr_glsl.c | 40 +-
SP/code/rend2/tr_image.c | 544 ++++----
SP/code/rend2/tr_image_bmp.c | 6 +-
SP/code/rend2/tr_image_jpg.c | 65 +-
SP/code/rend2/tr_image_pcx.c | 6 +-
SP/code/rend2/tr_image_png.c | 6 +-
SP/code/rend2/tr_image_tga.c | 6 +-
SP/code/rend2/tr_init.c | 9 +-
SP/code/rend2/tr_light.c | 2 +-
SP/code/rend2/tr_local.h | 20 +-
SP/code/rend2/tr_main.c | 2 +-
SP/code/rend2/tr_scene.c | 21 +-
SP/code/rend2/tr_shade.c | 31 +-
SP/code/rend2/tr_shader.c | 82 +-
SP/code/renderer/tr_image_jpg.c | 59 +-
SP/code/renderer/tr_shade.c | 4 +
SP/code/server/sv_bot.c | 2 +-
SP/code/sys/sys_win32.c | 10 +-
SP/code/ui/ui_atoms.c | 23 -
SP/code/ui/ui_local.h | 2 +
SP/code/ui/ui_main.c | 176 ++-
SP/code/ui/ui_shared.c | 177 ++-
SP/code/ui/ui_shared.h | 6 +
SP/code/zlib-1.2.8/ioapi.c | 247 ++++
SP/code/zlib-1.2.8/ioapi.h | 213 +++
SP/code/zlib-1.2.8/unzip.c | 2136 +++++++++++++++++++++++++++++++
SP/code/{qcommon => zlib-1.2.8}/unzip.h | 142 +-
SP/rend2-readme.txt | 32 +-
iortcw-command-changes.txt | 34 +
iortcw-cvars-new.txt | 134 ++
iortcw-cvars-removed.txt | 36 +
rend2-cvars.txt | 65 +
118 files changed, 9472 insertions(+), 6916 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list