This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw.
commit 190dca5dd8e8920b852a440655021215774865e9 Merge: ecae6a1 5e81bde Author: Simon McVittie <[email protected]> Date: Sun Nov 20 17:33:39 2016 +0000 Merge tag 'upstream/1.50a+dfsg1' into debian/master Upstream version 1.50a+dfsg1 .gitignore | 3 +- MP/.gitignore | 3 +- MP/Makefile | 199 +++---- MP/code/botlib/be_aas_cluster.c | 2 +- MP/code/botlib/l_precomp.c | 2 +- MP/code/cgame/cg_draw.c | 39 +- MP/code/cgame/cg_ents.c | 2 +- MP/code/cgame/cg_view.c | 264 +++++---- MP/code/cgame/cg_weapons.c | 5 +- MP/code/client/cl_cin.c | 1 + MP/code/client/cl_curl.h | 4 +- MP/code/client/cl_input.c | 30 +- MP/code/client/cl_keys.c | 27 + MP/code/client/cl_main.c | 13 +- MP/code/client/cl_ui.c | 4 +- MP/code/client/client.h | 4 +- MP/code/client/keycodes.h | 30 + MP/code/client/snd_codec_ogg.c | 6 +- MP/code/client/snd_dma.c | 3 +- MP/code/client/snd_mix.c | 2 +- MP/code/client/snd_openal.c | 28 +- MP/code/client/snd_wavelet.c | 21 +- MP/code/game/ai_cast_characters.c | 2 +- MP/code/game/ai_cast_funcs.c | 2 +- MP/code/game/ai_cast_script_actions.c | 2 +- MP/code/game/ai_cast_think.c | 6 +- MP/code/game/ai_dmnet.c | 3 +- MP/code/game/bg_lib.c | 7 +- MP/code/game/bg_pmove.c | 27 +- MP/code/game/g_main.c | 7 +- MP/code/game/g_mover.c | 2 +- MP/code/game/g_team.c | 2 +- MP/code/game/g_tramcar.c | 2 +- MP/code/null/null_glimp.c | 13 +- MP/code/qcommon/cm_trace.c | 2 +- MP/code/qcommon/common.c | 61 +- MP/code/qcommon/files.c | 81 ++- MP/code/qcommon/json.h | 353 ++++++++++++ MP/code/qcommon/msg.c | 22 - MP/code/qcommon/pbmd5.c | 8 +- MP/code/qcommon/q_platform.h | 9 +- MP/code/qcommon/q_shared.c | 10 +- MP/code/qcommon/q_shared.h | 17 +- MP/code/qcommon/qcommon.h | 17 +- MP/code/rend2/glsl/calclevels4x_fp.glsl | 4 +- MP/code/rend2/glsl/depthblur_fp.glsl | 76 ++- MP/code/rend2/glsl/depthblur_vp.glsl | 6 +- MP/code/rend2/glsl/lightall_fp.glsl | 181 +++--- MP/code/rend2/glsl/lightall_vp.glsl | 43 +- MP/code/rend2/glsl/ssao_fp.glsl | 54 +- MP/code/rend2/glsl/tonemap_fp.glsl | 11 +- MP/code/rend2/qgl.h | 400 +++++--------- MP/code/rend2/tr_animation.c | 20 +- MP/code/rend2/tr_backend.c | 487 ++++++++-------- MP/code/rend2/tr_bsp.c | 726 ++++++++++++------------ MP/code/rend2/tr_curve.c | 82 +-- MP/code/rend2/tr_dsa.c | 287 ++++++++++ MP/code/rend2/tr_dsa.h | 80 +++ MP/code/rend2/tr_extensions.c | 636 ++++----------------- MP/code/rend2/tr_extramath.c | 20 +- MP/code/rend2/tr_extramath.h | 1 + MP/code/rend2/tr_fbo.c | 458 +++++---------- MP/code/rend2/tr_fbo.h | 3 +- MP/code/rend2/tr_flares.c | 81 ++- MP/code/rend2/tr_font.c | 6 +- MP/code/rend2/tr_glsl.c | 352 ++++++------ MP/code/rend2/tr_image.c | 820 ++++++++++++++------------- MP/code/rend2/tr_image_dds.c | 498 +++++++++++++++++ MP/code/rend2/tr_init.c | 126 +++-- MP/code/rend2/tr_light.c | 83 ++- MP/code/rend2/tr_local.h | 150 ++--- MP/code/rend2/tr_main.c | 464 ++-------------- MP/code/rend2/tr_marks.c | 46 +- MP/code/rend2/tr_model.c | 244 ++++---- MP/code/rend2/tr_model_iqm.c | 33 +- MP/code/rend2/tr_postprocess.c | 124 ++--- MP/code/rend2/tr_scene.c | 6 - MP/code/rend2/tr_shade.c | 206 ++++--- MP/code/rend2/tr_shade_calc.c | 42 +- MP/code/rend2/tr_shader.c | 164 ++++-- MP/code/rend2/tr_shadows.c | 4 +- MP/code/rend2/tr_sky.c | 12 +- MP/code/rend2/tr_surface.c | 720 ++++-------------------- MP/code/rend2/tr_vbo.c | 330 ++++------- MP/code/rend2/tr_world.c | 22 +- MP/code/renderer/qgl.h | 415 +++++--------- MP/code/renderer/tr_animation.c | 2 +- MP/code/renderer/tr_flares.c | 25 +- MP/code/renderer/tr_font.c | 6 +- MP/code/renderer/tr_image.c | 6 +- MP/code/renderer/tr_init.c | 32 +- MP/code/renderer/tr_light.c | 25 +- MP/code/renderer/tr_local.h | 2 - MP/code/renderer/tr_shade.c | 2 +- MP/code/renderer/tr_shade_calc.c | 9 +- MP/code/renderer/tr_shader.c | 65 ++- MP/code/renderer/tr_sky.c | 2 + MP/code/renderer/tr_surface.c | 2 +- MP/code/renderer/tr_world.c | 10 +- MP/code/sdl/sdl_input.c | 287 +++++++++- MP/code/server/server.h | 4 +- MP/code/server/sv_ccmds.c | 17 +- MP/code/server/sv_client.c | 43 +- MP/code/server/sv_init.c | 19 +- MP/code/server/sv_main.c | 272 +++------ MP/code/splines/math_vector.cpp | 2 +- MP/code/splines/q_splineshared.h | 6 +- MP/code/sys/sys_local.h | 2 +- MP/code/sys/sys_main.c | 73 ++- MP/code/sys/sys_osx.m | 2 +- MP/code/sys/sys_unix.c | 52 +- MP/code/tools/asm/q3asm.c | 2 +- MP/code/ui/ui_main.c | 365 ++++++------ MP/code/ui/ui_shared.c | 101 +++- MP/code/ui/ui_shared.h | 1 + MP/code/zlib-1.2.8/ioapi.c | 2 +- MP/code/zlib-1.2.8/ioapi.h | 4 +- MP/cross-make-mingw.sh | 18 +- MP/cross-make-mingw64.sh | 16 +- MP/{rend2-readme.txt => rend2-readme.md} | 221 ++++---- README.md | 64 +-- SP/.gitignore | 3 +- SP/Makefile | 199 +++---- SP/code/botlib/be_aas_cluster.c | 2 +- SP/code/botlib/l_precomp.c | 2 +- SP/code/cgame/cg_draw.c | 52 +- SP/code/cgame/cg_effects.c | 10 - SP/code/cgame/cg_ents.c | 2 +- SP/code/cgame/cg_info.c | 15 - SP/code/cgame/cg_local.h | 2 + SP/code/cgame/cg_main.c | 4 + SP/code/cgame/cg_newdraw.c | 4 +- SP/code/cgame/cg_weapons.c | 5 +- SP/code/client/cl_cin.c | 1 + SP/code/client/cl_curl.h | 4 +- SP/code/client/cl_input.c | 30 +- SP/code/client/cl_keys.c | 27 + SP/code/client/cl_main.c | 11 +- SP/code/client/client.h | 4 +- SP/code/client/keycodes.h | 30 + SP/code/client/snd_codec_ogg.c | 6 +- SP/code/client/snd_dma.c | 5 +- SP/code/client/snd_mix.c | 2 +- SP/code/client/snd_openal.c | 32 +- SP/code/client/snd_wavelet.c | 21 +- SP/code/game/ai_cast_characters.c | 2 +- SP/code/game/ai_cast_funcs.c | 4 +- SP/code/game/ai_cast_script_actions.c | 2 +- SP/code/game/ai_cast_think.c | 6 +- SP/code/game/ai_dmnet.c | 3 +- SP/code/game/bg_lib.c | 7 +- SP/code/game/bg_pmove.c | 917 +++++++++++++++---------------- SP/code/game/g_func_decs.h | 2 +- SP/code/game/g_main.c | 4 +- SP/code/game/g_mover.c | 2 +- SP/code/game/g_team.c | 2 +- SP/code/game/g_tramcar.c | 2 +- SP/code/null/null_glimp.c | 13 +- SP/code/qcommon/cm_trace.c | 2 +- SP/code/qcommon/common.c | 66 ++- SP/code/qcommon/files.c | 77 ++- SP/code/qcommon/json.h | 353 ++++++++++++ SP/code/qcommon/msg.c | 22 - SP/code/qcommon/q_platform.h | 9 +- SP/code/qcommon/q_shared.c | 19 +- SP/code/qcommon/q_shared.h | 16 +- SP/code/qcommon/qcommon.h | 11 +- SP/code/rend2/glsl/calclevels4x_fp.glsl | 4 +- SP/code/rend2/glsl/depthblur_fp.glsl | 76 ++- SP/code/rend2/glsl/depthblur_vp.glsl | 6 +- SP/code/rend2/glsl/lightall_fp.glsl | 181 +++--- SP/code/rend2/glsl/lightall_vp.glsl | 43 +- SP/code/rend2/glsl/ssao_fp.glsl | 54 +- SP/code/rend2/glsl/tonemap_fp.glsl | 11 +- SP/code/rend2/qgl.h | 399 +++++--------- SP/code/rend2/tr_animation.c | 19 +- SP/code/rend2/tr_backend.c | 518 +++++++++-------- SP/code/rend2/tr_bsp.c | 728 ++++++++++++------------ SP/code/rend2/tr_curve.c | 82 +-- SP/code/rend2/tr_dsa.c | 287 ++++++++++ SP/code/rend2/tr_dsa.h | 80 +++ SP/code/rend2/tr_extensions.c | 636 ++++----------------- SP/code/rend2/tr_extramath.c | 20 +- SP/code/rend2/tr_extramath.h | 1 + SP/code/rend2/tr_fbo.c | 458 +++++---------- SP/code/rend2/tr_fbo.h | 3 +- SP/code/rend2/tr_flares.c | 81 ++- SP/code/rend2/tr_font.c | 6 +- SP/code/rend2/tr_glsl.c | 352 ++++++------ SP/code/rend2/tr_image.c | 832 ++++++++++++++-------------- SP/code/rend2/tr_image_dds.c | 498 +++++++++++++++++ SP/code/rend2/tr_init.c | 126 +++-- SP/code/rend2/tr_light.c | 84 ++- SP/code/rend2/tr_local.h | 148 ++--- SP/code/rend2/tr_main.c | 470 ++-------------- SP/code/rend2/tr_marks.c | 46 +- SP/code/rend2/tr_model.c | 246 ++++----- SP/code/rend2/tr_model_iqm.c | 33 +- SP/code/rend2/tr_postprocess.c | 124 ++--- SP/code/rend2/tr_scene.c | 6 - SP/code/rend2/tr_shade.c | 205 ++++--- SP/code/rend2/tr_shade_calc.c | 40 +- SP/code/rend2/tr_shader.c | 149 +++-- SP/code/rend2/tr_shadows.c | 4 +- SP/code/rend2/tr_sky.c | 12 +- SP/code/rend2/tr_surface.c | 719 ++++-------------------- SP/code/rend2/tr_vbo.c | 330 ++++------- SP/code/rend2/tr_world.c | 22 +- SP/code/renderer/qgl.h | 414 +++++--------- SP/code/renderer/tr_animation.c | 2 +- SP/code/renderer/tr_flares.c | 25 +- SP/code/renderer/tr_font.c | 6 +- SP/code/renderer/tr_image.c | 6 +- SP/code/renderer/tr_init.c | 32 +- SP/code/renderer/tr_light.c | 25 +- SP/code/renderer/tr_local.h | 2 - SP/code/renderer/tr_shade.c | 2 +- SP/code/renderer/tr_shade_calc.c | 9 +- SP/code/renderer/tr_shader.c | 56 +- SP/code/renderer/tr_sky.c | 2 + SP/code/renderer/tr_surface.c | 2 +- SP/code/renderer/tr_world.c | 10 +- SP/code/sdl/sdl_input.c | 287 +++++++++- SP/code/server/sv_ccmds.c | 6 +- SP/code/server/sv_client.c | 23 +- SP/code/server/sv_init.c | 2 +- SP/code/server/sv_main.c | 96 ++-- SP/code/splines/math_vector.cpp | 2 +- SP/code/splines/q_splineshared.h | 6 +- SP/code/sys/sys_local.h | 2 +- SP/code/sys/sys_main.c | 73 ++- SP/code/sys/sys_osx.m | 2 +- SP/code/sys/sys_unix.c | 52 +- SP/code/tools/asm/q3asm.c | 2 +- SP/code/ui/ui_main.c | 383 ++++++------- SP/code/ui/ui_shared.c | 98 +++- SP/code/ui/ui_shared.h | 1 + SP/code/zlib-1.2.8/ioapi.c | 2 +- SP/code/zlib-1.2.8/ioapi.h | 4 +- SP/cross-make-mingw.sh | 4 +- SP/cross-make-mingw64.sh | 2 +- SP/{rend2-readme.txt => rend2-readme.md} | 211 ++++--- 242 files changed, 11596 insertions(+), 12039 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
