[ioquake3] 02/07: Merge tag 'upstream/1.36+u20160122+dfsg1'
Simon McVittie
smcv at debian.org
Fri Jan 22 12:06:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository ioquake3.
commit 85a43642b96cb32ec00ae11546771db66a09bacc
Merge: 48d7074 807a1c5
Author: Simon McVittie <smcv at debian.org>
Date: Fri Jan 22 07:43:06 2016 +0000
Merge tag 'upstream/1.36+u20160122+dfsg1'
Upstream version 1.36+u20160122+dfsg1
Makefile | 82 +--
code/client/cl_cgame.c | 36 +-
code/client/cl_input.c | 4 +-
code/client/cl_main.c | 206 +++++--
code/client/cl_parse.c | 105 ++--
code/client/client.h | 21 +-
code/client/snd_openal.c | 8 +-
code/qcommon/common.c | 178 +++++-
code/qcommon/q_shared.h | 4 +
code/qcommon/qcommon.h | 11 +-
code/renderercommon/qgl.h | 57 +-
code/renderercommon/tr_image_jpg.c | 59 +-
code/renderergl2/glsl/lightall_fp.glsl | 251 ++-------
code/renderergl2/tr_backend.c | 274 ++++------
code/renderergl2/tr_bsp.c | 32 +-
code/renderergl2/tr_dsa.c | 284 ++++++++++
code/renderergl2/tr_dsa.h | 80 +++
code/renderergl2/tr_extensions.c | 135 ++++-
code/renderergl2/tr_fbo.c | 290 ++--------
code/renderergl2/tr_fbo.h | 1 +
code/renderergl2/tr_glsl.c | 124 +----
code/renderergl2/tr_image.c | 781 +++++++++++++-------------
code/renderergl2/tr_image_dds.c | 498 +++++++++++++++++
code/renderergl2/tr_init.c | 57 +-
code/renderergl2/tr_light.c | 2 +-
code/renderergl2/tr_local.h | 35 +-
code/renderergl2/tr_main.c | 4 +-
code/renderergl2/tr_postprocess.c | 105 ++--
code/renderergl2/tr_scene.c | 21 +-
code/renderergl2/tr_shade.c | 47 +-
code/renderergl2/tr_shader.c | 70 ++-
code/renderergl2/tr_shadows.c | 4 +-
code/renderergl2/tr_sky.c | 2 +-
code/renderergl2/tr_surface.c | 4 +-
code/server/server.h | 3 +-
code/server/sv_ccmds.c | 104 ++++
code/server/sv_client.c | 22 +-
code/server/sv_init.c | 3 +-
code/server/sv_main.c | 5 +-
code/server/sv_snapshot.c | 2 +-
code/sys/sys_win32.c | 10 +-
misc/msvc12/cgame.def | 3 +
misc/msvc12/cgame.vcxproj | 604 ++++++++++++++++++++
misc/msvc12/game.def | 3 +
misc/msvc12/game.vcxproj | 695 +++++++++++++++++++++++
misc/msvc12/glsl_stringify.vbs | 18 +
misc/msvc12/ioq3.sln | 83 +++
misc/msvc12/opengl1.vcxproj | 428 +++++++++++++++
misc/msvc12/opengl1.vcxproj.filters | 260 +++++++++
misc/msvc12/opengl2.vcxproj | 589 ++++++++++++++++++++
misc/msvc12/opengl2.vcxproj.filters | 355 ++++++++++++
misc/msvc12/q3_ui.def | 3 +
misc/msvc12/q3_ui.vcxproj | 967 ++++++++++++++++++++++++++++++++
misc/msvc12/quake3.vcxproj | 970 +++++++++++++++++++++++++++++++++
misc/msvc12/quake3.vcxproj.filters | 708 ++++++++++++++++++++++++
misc/msvc12/ui.def | 3 +
misc/msvc12/ui.vcxproj | 451 +++++++++++++++
opengl2-readme.md | 32 +-
58 files changed, 8647 insertions(+), 1546 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list