[iortcw] 41/152: All: Rend2: Merge testing branch

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit 0e470ac935c8d7f6e9711b722c7353362547e61d
Merge: af101ee 3b8aa51
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Mar 19 10:01:59 2016 -0400

    All: Rend2: Merge testing branch

 MP/Makefile                             |   1 +
 MP/code/qcommon/json.h                  | 353 +++++++++++++++++++++++++++++
 MP/code/rend2/glsl/calclevels4x_fp.glsl |   4 +-
 MP/code/rend2/glsl/depthblur_fp.glsl    |  69 +++---
 MP/code/rend2/glsl/depthblur_vp.glsl    |   5 +-
 MP/code/rend2/glsl/lightall_fp.glsl     | 141 +++++-------
 MP/code/rend2/glsl/lightall_vp.glsl     |  21 +-
 MP/code/rend2/glsl/ssao_fp.glsl         |  54 ++---
 MP/code/rend2/glsl/tonemap_fp.glsl      |  11 +-
 MP/code/rend2/qgl.h                     |  44 ++++
 MP/code/rend2/tr_animation.c            |   6 +-
 MP/code/rend2/tr_backend.c              | 311 +++++++++-----------------
 MP/code/rend2/tr_bsp.c                  | 140 ++++++++++--
 MP/code/rend2/tr_dsa.c                  | 287 ++++++++++++++++++++++++
 MP/code/rend2/tr_dsa.h                  |  80 +++++++
 MP/code/rend2/tr_extensions.c           | 109 +++++++++
 MP/code/rend2/tr_fbo.c                  | 338 ++++++++--------------------
 MP/code/rend2/tr_fbo.h                  |   1 +
 MP/code/rend2/tr_glsl.c                 | 119 +++-------
 MP/code/rend2/tr_image.c                | 383 ++++++++++++++++---------------
 MP/code/rend2/tr_init.c                 |  43 ++--
 MP/code/rend2/tr_local.h                |  32 ++-
 MP/code/rend2/tr_main.c                 |   4 +-
 MP/code/rend2/tr_postprocess.c          | 105 ++++-----
 MP/code/rend2/tr_scene.c                |   2 +-
 MP/code/rend2/tr_shade.c                |  71 +++---
 MP/code/rend2/tr_shader.c               |  60 +++--
 MP/code/rend2/tr_shadows.c              |   4 +-
 MP/code/rend2/tr_sky.c                  |   4 +-
 MP/code/rend2/tr_surface.c              |   4 +-
 MP/code/renderer/qgl.h                  |  56 ++++-
 MP/code/renderer/tr_image.c             |   6 +-
 MP/code/renderer/tr_local.h             |   1 -
 MP/rend2-readme.txt                     |  20 +-
 SP/Makefile                             |   1 +
 SP/code/qcommon/json.h                  | 353 +++++++++++++++++++++++++++++
 SP/code/rend2/glsl/calclevels4x_fp.glsl |   4 +-
 SP/code/rend2/glsl/depthblur_fp.glsl    |  69 +++---
 SP/code/rend2/glsl/depthblur_vp.glsl    |   5 +-
 SP/code/rend2/glsl/lightall_fp.glsl     | 141 +++++-------
 SP/code/rend2/glsl/lightall_vp.glsl     |  21 +-
 SP/code/rend2/glsl/ssao_fp.glsl         |  54 ++---
 SP/code/rend2/glsl/tonemap_fp.glsl      |  11 +-
 SP/code/rend2/qgl.h                     |  44 ++++
 SP/code/rend2/tr_animation.c            |   4 +-
 SP/code/rend2/tr_backend.c              | 312 +++++++++-----------------
 SP/code/rend2/tr_bsp.c                  | 140 ++++++++++--
 SP/code/rend2/tr_dsa.c                  | 287 ++++++++++++++++++++++++
 SP/code/rend2/tr_dsa.h                  |  80 +++++++
 SP/code/rend2/tr_extensions.c           | 109 +++++++++
 SP/code/rend2/tr_fbo.c                  | 338 ++++++++--------------------
 SP/code/rend2/tr_fbo.h                  |   1 +
 SP/code/rend2/tr_glsl.c                 | 119 +++-------
 SP/code/rend2/tr_image.c                | 384 ++++++++++++++++----------------
 SP/code/rend2/tr_init.c                 |  43 ++--
 SP/code/rend2/tr_local.h                |  32 ++-
 SP/code/rend2/tr_main.c                 |   4 +-
 SP/code/rend2/tr_postprocess.c          | 105 ++++-----
 SP/code/rend2/tr_scene.c                |   2 +-
 SP/code/rend2/tr_shade.c                |  71 +++---
 SP/code/rend2/tr_shader.c               |  60 +++--
 SP/code/rend2/tr_shadows.c              |   4 +-
 SP/code/rend2/tr_sky.c                  |   4 +-
 SP/code/rend2/tr_surface.c              |   4 +-
 SP/code/renderer/qgl.h                  |  56 ++++-
 SP/code/renderer/tr_image.c             |   6 +-
 SP/code/renderer/tr_local.h             |   1 -
 SP/rend2-readme.txt                     |  21 +-
 68 files changed, 3606 insertions(+), 2173 deletions(-)


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