[ioquake3] 06/59: OpenGL2: Add new GL function loader.

[Simon McVittie]

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

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

commit f0086e8c2abdd08102a399f0c68eb1dd82d67c9b
Author: SmileTheory 
Date:   Mon Jul 25 06:30:25 2016 -0700

OpenGL2: Add new GL function loader.
---
 code/renderercommon/qgl.h| 103 ---
 code/renderergl2/tr_extensions.c | 115 ++-
 2 files changed, 77 insertions(+), 141 deletions(-)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 9c514a9..6f27e13 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -377,59 +377,74 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 #define qglVertexPointer glVertexPointer
 #define qglViewport glViewport
 
+// GL function loader, based on 
https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
+
 // OpenGL 1.2, was GL_EXT_draw_range_elements
-extern void (APIENTRY * qglDrawRangeElements) (GLenum mode, GLuint start, 
GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#define QGL_1_2_PROCS \
+   GLE(void, DrawRangeElements, GLenum mode, GLuint start, GLuint end, 
GLsizei count, GLenum type, const GLvoid *indices) \
 
 // OpenGL 1.3, was GL_ARB_texture_compression
-extern void (APIENTRY * qglCompressedTexImage2D) (GLenum target, GLint level, 
GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei 
imageSize, const void *data);
-extern void (APIENTRY * qglCompressedTexSubImage2D) (GLenum target, GLint 
level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum 
format, GLsizei imageSize, const void *data);
+#define QGL_1_3_PROCS \
+   GLE(void, CompressedTexImage2D, GLenum target, GLint level, GLenum 
internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, 
const void *data) \
+   GLE(void, CompressedTexSubImage2D, GLenum target, GLint level, GLint 
xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei 
imageSize, const void *data) \
 
 // OpenGL 1.4, was GL_EXT_multi_draw_arrays
-extern void (APIENTRY * qglMultiDrawElements) (GLenum mode, const GLsizei 
*count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#define QGL_1_4_PROCS \
+   GLE(void, MultiDrawElements, GLenum mode, const GLsizei *count, GLenum 
type, const GLvoid* *indices, GLsizei primcount) \
 
 // OpenGL 1.5, was GL_ARB_vertex_buffer_object and GL_ARB_occlusion_query
-extern void (APIENTRY * qglGenQueries) (GLsizei n, GLuint *ids);
-extern void (APIENTRY * qglDeleteQueries) (GLsizei n, const GLuint *ids);
-extern void (APIENTRY * qglBeginQuery) (GLenum target, GLuint id);
-extern void (APIENTRY * qglEndQuery) (GLenum target);
-extern void (APIENTRY * qglGetQueryObjectiv) (GLuint id, GLenum pname, GLint 
*params);
-extern void (APIENTRY * qglGetQueryObjectuiv) (GLuint id, GLenum pname, GLuint 
*params);
-extern void (APIENTRY * qglBindBuffer) (GLenum target, GLuint buffer);
-extern void (APIENTRY * qglDeleteBuffers) (GLsizei n, const GLuint *buffers);
-extern void (APIENTRY * qglGenBuffers) (GLsizei n, GLuint *buffers);
-extern void (APIENTRY * qglBufferData) (GLenum target, GLsizeiptr size, const 
void *data, GLenum usage);
-extern void (APIENTRY * qglBufferSubData) (GLenum target, GLintptr offset, 
GLsizeiptr size, const void *data);
+#define QGL_1_5_PROCS \
+   GLE(void, GenQueries, GLsizei n, GLuint *ids) \
+   GLE(void, DeleteQueries, GLsizei n, const GLuint *ids) \
+   GLE(void, BeginQuery, GLenum target, GLuint id) \
+   GLE(void, EndQuery, GLenum target) \
+   GLE(void, GetQueryObjectiv, GLuint id, GLenum pname, GLint *params) \
+   GLE(void, GetQueryObjectuiv, GLuint id, GLenum pname, GLuint *params) \
+   GLE(void, BindBuffer, GLenum target, GLuint buffer) \
+   GLE(void, DeleteBuffers, GLsizei n, const GLuint *buffers) \
+   GLE(void, GenBuffers, GLsizei n, GLuint *buffers) \
+   GLE(void, BufferData, GLenum target, GLsizeiptr size, const void *data, 
GLenum usage) \
+   GLE(void, BufferSubData, GLenum target, GLintptr offset, GLsizeiptr 
size, const void *data) \
 
 // OpenGL 2.0, was GL_ARB_shading_language_100, GL_ARB_vertex_program, 
GL_ARB_shader_objects, and GL_ARB_vertex_shader
-extern void (APIENTRY * qglAttachShader) (GLuint program, GLuint shader);
-extern void (APIENTRY * qglBindAttribLocation) (GLuint program, GLuint index, 
const GLchar *name);
-extern void (APIENTRY * qglCompileShader) (GLuint shader);
-extern GLuint (APIENTRY * qglCreateProgram) (void);
-extern GLuint (APIENTRY * qglCreateShader) (GLenum type);
-extern void (APIENTRY * qglDeleteProgram) (GLuint program);
-extern void (APIENTRY * qglDeleteShader) (GLuint shader);
-extern void (APIENTRY * qglDetachShader) (GLuint program, GLuint shader);
-extern void (APIENTRY * qglDisableVertexAttribArray) (GLuint index);
-extern void (APIENTRY * qglEnableVertexAttribArray) 

[ioquake3] 17/59: Controller hot plug support.

[Simon McVittie]

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

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

commit d09866861e816caed1710c5c4f7bc4197d52da92
Author: SmileTheory 
Date:   Thu Aug 4 21:32:35 2016 -0700

Controller hot plug support.
---
 code/sdl/sdl_input.c | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 90ad596..1af20ec 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -434,15 +434,15 @@ static void IN_InitJoystick( void )
stick = NULL;
memset(_state, '\0', sizeof (stick_state));
 
-   if (!SDL_WasInit(SDL_INIT_JOYSTICK))
+   if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER))
{
-   Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
-   if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
+   Com_DPrintf("Calling SDL_Init(SDL_INIT_GAMECONTROLLER)...\n");
+   if (SDL_Init(SDL_INIT_GAMECONTROLLER) != 0)
{
-   Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", 
SDL_GetError());
+   Com_DPrintf("SDL_Init(SDL_INIT_GAMECONTROLLER) failed: 
%s\n", SDL_GetError());
return;
}
-   Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) passed.\n");
+   Com_DPrintf("SDL_Init(SDL_INIT_GAMECONTROLLER) passed.\n");
}
 
total = SDL_NumJoysticks();
@@ -459,7 +459,7 @@ static void IN_InitJoystick( void )
 
if( !in_joystick->integer ) {
Com_DPrintf( "Joystick is not active.\n" );
-   SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+   SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
return;
}
 
@@ -494,7 +494,7 @@ IN_ShutdownJoystick
 */
 static void IN_ShutdownJoystick( void )
 {
-   if ( !SDL_WasInit( SDL_INIT_JOYSTICK ) )
+   if ( !SDL_WasInit( SDL_INIT_GAMECONTROLLER ) )
return;
 
if (stick)
@@ -503,7 +503,7 @@ static void IN_ShutdownJoystick( void )
stick = NULL;
}
 
-   SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+   SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
 }
 
 /*
@@ -840,6 +840,11 @@ static void IN_ProcessEvents( void )
}
break;
 
+   case SDL_CONTROLLERDEVICEADDED:
+   case SDL_CONTROLLERDEVICEREMOVED:
+   IN_InitJoystick();
+   break;
+
case SDL_QUIT:
Cbuf_ExecuteText(EXEC_NOW, "quit Closed 
window\n");
break;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] annotated tag upstream/1.36+u20160914+dfsg1 created (now 1a9f95b)

[Simon McVittie]

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

smcv pushed a change to annotated tag upstream/1.36+u20160914+dfsg1
in repository ioquake3.

at  1a9f95b   (tag)
   tagging  f9ef5ebae1d8ebed63e7e18bbf7e98a41c72d325 (commit)
  replaces  upstream/1.36+u20160616+dfsg1
 tagged by  Simon McVittie
on  Wed Sep 21 10:44:39 2016 +0100

- Log -
Upstream version 1.36+u20160914+dfsg1

James Canete (3):
  Fix OpenGL2 readme missing text in md
  Merge pull request #207 from MAN-AT-ARMS/sdl204
  Merge pull request #212 from MAN-AT-ARMS/sdl204-stripped

MAN-AT-ARMS (2):
  Update SDL2 to 2.0.4
  Add stripped SDL2 reference dll's to repo

Simon McVittie (1):
  New upstream version 1.36+u20160914+dfsg1

SmileTheory (23):
  OpenGL2: Require OpenGL 2.0.
  OpenGL2: Add new GL function loader.
  OpenGL2: Use loader for all extension funcs.
  OpenGL2: Fix GL_EXT_direct_state_access function names.
  OpenGL2: Let unlit materials use parallax maps.
  OpenGL2: Fix shader error logs.
  Better defaults for joystick axes.
  Controller hot plug support.
  Better gamepad support.
  Fix stricmp usage in previous commit.
  Fix black screen when in_joystick disabled but controller connected.
  OpenGL2: Preallocate grid surfaces like other BSP surfaces.
  Missing bit of previous commit.
  Fix joystick w/o controller mapping not working with SDL update.
  OpenGL2: Store normals/tangents as int16_t[4].
  OpenGL2: Fix missing bounds calculation when loading BSP surfaces.
  OpenGL2: Make R_FreeSurfaceGridMeshData() static.
  Fix undefined behavior when shifting left by 32.
  OpenGL2: Fix reversed VectorCopy4() usage.
  OpenGL2: Fix more reversed VectorCopy4() usage.
  OpenGL2: Remove map color scaling and r_forceSunMapLightScale.
  OpenGL2: Remove per fragment tangent space calculation code.
  OpenGL2: Clamp entity lighting to more resemble OpenGL1.

Thomas Köppe (7):
  [tools/asm/q3asm.c] Remove 'abs(unsigned)', which is unnecessary and 
potentially wrong
  [botlib] Use floating point absolute value rather than truncate to integer
  [null/null_glimp.c] Fix up bitrot in null impl
  [game/ai_main.c] Use floating-point fabs() for floating-point values
  [renderergl2/tr_main.c] Use floating-point fabsf() for floating-point 
values
  [qcommon/msg.c] Remove dead code (which had undefined behaviour)
  [code/botlib/l_precomp.c] Fix string buffer overflow

Tim Angus (6):
  Merge pull request #195 from tkoeppe/intfix
  Merge pull request #197 from tkoeppe/null
  Merge pull request #213 from tkoeppe/abs
  Merge pull request #220 from tkoeppe/shift
  Merge pull request #216 from tkoeppe/abs
  Merge pull request #221 from tkoeppe/strncpy

Zachary J. Slater (2):
  Minor updates to README.md
  Minor URL change.

Zack Middleton (3):
  Fix typo of empty in ai_main.c
  Fix bot team order to kill last player it killed
  Make using Yacc optional, disabled by default

---

This annotated tag includes the following new commits:

   new  274fa89   Fix typo of empty in ai_main.c
   new  4474297   Fix bot team order to kill last player it killed
   new  0ad4381   Make using Yacc optional, disabled by default
   new  ebc7894   Fix OpenGL2 readme missing text in md
   new  251c983   OpenGL2: Require OpenGL 2.0.
   new  f0086e8   OpenGL2: Add new GL function loader.
   new  9a5add2   [tools/asm/q3asm.c] Remove 'abs(unsigned)', which is 
unnecessary and potentially wrong
   new  18d6c8f   [botlib] Use floating point absolute value rather than 
truncate to integer
   new  2ef99c8   Merge pull request #195 from tkoeppe/intfix
   new  7164381   OpenGL2: Use loader for all extension funcs.
   new  bbe99a8   [null/null_glimp.c] Fix up bitrot in null impl
   new  1051df4   Merge pull request #197 from tkoeppe/null
   new  e022abe   OpenGL2: Fix GL_EXT_direct_state_access function names.
   new  29ac117   OpenGL2: Let unlit materials use parallax maps.
   new  5252e28   OpenGL2: Fix shader error logs.
   new  1972128   Better defaults for joystick axes.
   new  d098668   Controller hot plug support.
   new  879fb55   Minor updates to README.md
   new  b7f2ebd   Better gamepad support.
   new  6262972   Fix stricmp usage in previous commit.
   new  f47aaa2   Minor URL change.
   new  1cf0b21   Fix black screen when in_joystick disabled but controller 
connected.
   new  fe8ac83   OpenGL2: Preallocate grid surfaces like other BSP 
surfaces.
   new  4ce600f   Missing bit of previous commit.
   new  4f9310d   Update SDL2 to 2.0.4
   new  e8c5b3a   Merge pull request #207 from MAN-AT-ARMS/sdl204
   new  966d39e   Add stripped 

[ioquake3] annotated tag upstream/1.36+u20160616+dfsg1 created (now dce0fb3)

[Simon McVittie]

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

smcv pushed a change to annotated tag upstream/1.36+u20160616+dfsg1
in repository ioquake3.

at  dce0fb3   (tag)
   tagging  7f70075275dadc66fad31dcac6e3aab96e914c47 (commit)
  replaces  upstream/1.36+u20160122+dfsg1
 tagged by  Simon McVittie
on  Mon Jun 27 10:32:11 2016 +0100

- Log -
Upstream version 1.36+u20160616+dfsg1

/dev/humancontroller (4):
  guard against out-of-bounds jump table targets
  Fix Com_RandomBytes weak-random case
  Fix return values in nested system calls from QVMs
  fix a stupid use of strcpy()

Anthony Pesch (3):
  fixed formatting of a few GLSL float constants
  don't clear screen during CA_LOADING and CA_PRIMED
  restart the renderer after the hunk mark has been set

Author: Xycaleth (1):
  OpenGL2: Fix shadow cubemap size

Brenton Bostick (1):
  Add mingw prefix for cygwin32 and mingw32

Daniel Heitmann (3):
  added systemd unit for easier server-deployment
  removed a few defaults to make it completely usable out of the box
  removed absolute path to binary, removed sv_pure parameter

Dion Williams (2):
  Fix Cvar_Unset not notifying cvar_modifiedFlags
  Ensure reads from /dev/urandom are unbuffered

Ensiform (4):
  Fix native trap_BotMutateGoalFuzzyLogic
  Fix an invalid null deref check in the slider code.
  Move Event processor call down below the mouse checks.
  Inform how many shader stages the max is in the warning message

James Canete (1):
  Merge pull request #57 from MAN-AT-ARMS/specularScale

Jeff Kent (1):
  fix buffer overflow in CL_CheckForResend

Jun Woong (1):
  Stop LCC from warning about null pointer conversion to function pointer

MAN-AT-ARMS (15):
  Replace deprecated alDopplerVelocity with alSpeedOfSound per OpenAL 1.1 
spec
  OpenGL2: Fix pshadows for MDR models
  Fix colored name padding and allow IPv6 address to fit in output of
  Release netowrk bindings on shutdown
  Fix s_alDopplerSpeed default value
  OpenGL2: Set default normal/specular in RE_RegisterShaderFromImage
  Update SDL2 to 2.0.2
  Update SDL 1.2.15 to Revision 8040
  Update SDL2 to 2.0.3
  Add MSVC SDL 1.2.15 Revision 8040 import libs
  Rebuilt MSVC SDL 1.2.15 Revision 8040 import libs
  Fix compiling on Linux Mint
  Fix possible division by zero in S_PaintChannelFrom16_altivec
  Change default value for s_alDopplerSpeed
  Fix building with curl on Linux PPC and Sparc

Martin Michlmayr (1):
  Add support for Aarch64 (ARM64)

Michael Rieder (2):
  Fix compile error with ml64 assembler
  Have custom intro cinematics for standalone game

Pan7 (24):
  sayto cmd with player name completion
  -ffast-math for msvc
  Add ColorIndexForNumber macro replacing '& 0x07'
  qcurl_multi_add_handle error check
  Renaming outp to outbufp because outp() is an existing function
  Windows header files for q3lcc
  q3lcc option -lcppdir and -lrccdir
  No unix memmove for msvc
  SIGABRT is in ANSI and POSIX.1, and SIGIOT isn't.
  SDL_Init zero check
  SDL_FALSE/TRUE for SDL_SetWindowGrab
  SDL_SetWindowGammaRamp check
  SDL_GetWindowDisplayIndex check
  SDL_CreateWindow NULL check
  Added SDL_GetError()
  Added SDL_GetError()
  SDL_GetWindowDisplayIndex() check2
  SDL_GL_SetSwapInterval() check
  qcurl_multi_remove_handle check
  qcurl_multi_strerror not curl_multi_strerror
  qcurl_easy_setopt dev warning
  qcurl_multi_cleanup check
  Add missing qcurl handle cleanup
  Fix va_list warning

Roberto Estrada (1):
  Switched runtime library to Multithreaded DLL to fix build on VS2012.

Ryan C. Gordon (1):
  Sys_GetProcessorFeatures() didn't check for 3DNow! or Altivec.

Simon McVittie (17):
  Add USE_INTERNAL_LIBS, a default for USE_INTERNAL_*
  Centralize checks for Freetype, with a user override
  Allow libcurl to be in a non-standard location on all platforms
  Allow OpenAL to be in a non-standard location on all platforms
  Allow system libjpeg to be in a non-standard location
  Find system zlib via user override, pkg-config or in standard locations
  Look for system Vorbis, Opus and Ogg via pkg-config
  Find Speex via user override, pkg-config or default search path
  Ensure that mbstowcs does not overflow its buffer
  Don't crash if more than 128 modes are available
  Use pkg-config for a system libjpeg if available: libjpeg-turbo has it
  unzip: comment why there is no USE_INTERNAL_MINIZIP boolean option
  Makefile: confine $(LIB) to the one platform that needs it, namely irix64
  build: canonicalize all ARM variants to "arm", matching q_platform.h
  build: define ARCH_STRING in Makefile on Linux and other GNU platforms
  build: if tput fails, 

[openarena] branch debian/master updated (f74af8b -> 0e26825)

[Simon McVittie]

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

smcv pushed a change to branch debian/master
in repository openarena.

  from  f74af8b   0.8.8-16
   new  16241bf   Move to debhelper compat level 10
   new  37a4478   Remove openarena-dbg, rely on automatic dbgsym packages 
instead
   new  2bcf5e1   debian/rules: align with ioquake3's
   new  72b2c2c   Revert "Remove openarena-dbg, rely on automatic dbgsym 
packages instead"
   new  0e26825   0.8.8-17

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 10 ++
 debian/compat|  2 +-
 debian/control   |  2 +-
 debian/rules | 92 +---
 4 files changed, 66 insertions(+), 40 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openarena] 04/05: Revert "Remove openarena-dbg, rely on automatic dbgsym packages instead"

[Simon McVittie]

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

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

commit 72b2c2c6514d90ad6ef781b5c47289832c949dfe
Author: Simon McVittie 
Date:   Wed Sep 21 20:20:26 2016 +0100

Revert "Remove openarena-dbg, rely on automatic dbgsym packages instead"

This reverts commit 37a4478fdd2a8e687d56209b9d2b346365ab1218.
Automatic dbgsym packages create conflicts when two packages contain
an identical library, which openarena and openarena-server currently do.
---
 debian/changelog |  1 -
 debian/control   | 18 ++
 debian/rules |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5384c99..e9383b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ openarena (0.8.8-17) UNRELEASED; urgency=medium
 
   * Move to debhelper compat level 10
 - don't build in parallel explicitly, it is now the default
-  * Remove openarena-dbg, rely on automatic dbgsym packages instead
   * debian/rules: align with ioquake3's
 - enable full compiler handling, but disable -fPIE -pie because this
   source package only compiles PIC shared objects
diff --git a/debian/control b/debian/control
index 0e1d13a..bb8dc3f 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,24 @@ Description: fast-paced 3D first-person shooter
  .
  This package installs the OpenArena client.
 
+Package: openarena-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
+ ${misc:Depends},
+Recommends:
+ ioquake3-dbg,
+Description: debug symbols for OpenArena's game logic
+ OpenArena is an open-source content package for ioQuake3 licensed under the
+ GPL, effectively creating a free stand-alone game. Though OpenArena is a free
+ replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
+ the proprietary game!
+ .
+ This package contains debug symbols which can be used to debug crashes in
+ OpenArena's game logic.
+
 Package: openarena-server
 Architecture: any
 Depends:
diff --git a/debian/rules b/debian/rules
index 01de1bc..3f0eed0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ override_dh_auto_install:
$(DESTDIR)/usr/lib/openarena-server/missionpack/
 
 override_dh_strip:
-   dh_strip --ddeb-migration='openarena-dbg (<< 0.8.8-17~)'
+   dh_strip --dbg-package=openarena-dbg
 
 # ---
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openarena] 05/05: 0.8.8-17

[Simon McVittie]

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

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

commit 0e26825c27c11cab82db394574dc903c5813745e
Author: Simon McVittie 
Date:   Wed Sep 21 20:23:10 2016 +0100

0.8.8-17
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9383b8..163c563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openarena (0.8.8-17) UNRELEASED; urgency=medium
+openarena (0.8.8-17) unstable; urgency=medium
 
   * Move to debhelper compat level 10
 - don't build in parallel explicitly, it is now the default
@@ -6,7 +6,7 @@ openarena (0.8.8-17) UNRELEASED; urgency=medium
 - enable full compiler handling, but disable -fPIE -pie because this
   source package only compiles PIC shared objects
 
- -- Simon McVittie   Wed, 21 Sep 2016 11:01:51 +0100
+ -- Simon McVittie   Wed, 21 Sep 2016 20:22:58 +0100
 
 openarena (0.8.8-16) unstable; urgency=medium
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openarena] 02/05: Remove openarena-dbg, rely on automatic dbgsym packages instead

[Simon McVittie]

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

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

commit 37a4478fdd2a8e687d56209b9d2b346365ab1218
Author: Simon McVittie 
Date:   Wed Sep 21 11:03:18 2016 +0100

Remove openarena-dbg, rely on automatic dbgsym packages instead
---
 debian/changelog |  1 +
 debian/control   | 18 --
 debian/rules |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 233e8c7..fd0c34d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openarena (0.8.8-17) UNRELEASED; urgency=medium
 
   * Move to debhelper compat level 10
 - don't build in parallel explicitly, it is now the default
+  * Remove openarena-dbg, rely on automatic dbgsym packages instead
 
  -- Simon McVittie   Wed, 21 Sep 2016 11:01:51 +0100
 
diff --git a/debian/control b/debian/control
index bb8dc3f..0e1d13a 100644
--- a/debian/control
+++ b/debian/control
@@ -42,24 +42,6 @@ Description: fast-paced 3D first-person shooter
  .
  This package installs the OpenArena client.
 
-Package: openarena-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
- ${misc:Depends},
-Recommends:
- ioquake3-dbg,
-Description: debug symbols for OpenArena's game logic
- OpenArena is an open-source content package for ioQuake3 licensed under the
- GPL, effectively creating a free stand-alone game. Though OpenArena is a free
- replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
- the proprietary game!
- .
- This package contains debug symbols which can be used to debug crashes in
- OpenArena's game logic.
-
 Package: openarena-server
 Architecture: any
 Depends:
diff --git a/debian/rules b/debian/rules
index fbdfccf..4e89794 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,7 +111,7 @@ override_dh_auto_install:
debian/tmp/usr/lib/openarena-server/missionpack/
 
 override_dh_strip:
-   dh_strip --dbg-package=openarena-dbg
+   dh_strip --ddeb-migration='openarena-dbg (<< 0.8.8-17~)'
 
 .PHONY: get-orig-source
 get-orig-source:

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openarena] 03/05: debian/rules: align with ioquake3's

[Simon McVittie]

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

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

commit 2bcf5e1e24c0d83a3dbced4ca3a2da1d479b4893
Author: Simon McVittie 
Date:   Wed Sep 21 11:17:48 2016 +0100

debian/rules: align with ioquake3's

  - enable full compiler handling, but disable -fPIE -pie because this
source package only compiles PIC shared objects
---
 debian/changelog |  3 ++
 debian/rules | 92 +---
 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd0c34d..5384c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openarena (0.8.8-17) UNRELEASED; urgency=medium
   * Move to debhelper compat level 10
 - don't build in parallel explicitly, it is now the default
   * Remove openarena-dbg, rely on automatic dbgsym packages instead
+  * debian/rules: align with ioquake3's
+- enable full compiler handling, but disable -fPIE -pie because this
+  source package only compiles PIC shared objects
 
  -- Simon McVittie   Wed, 21 Sep 2016 11:01:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 4e89794..01de1bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export LC_ALL=C.UTF-8
 export TZ=UTC
 
+DEB_CFLAGS_MAINT_APPEND := \
+   -fsigned-char \
+   $(NULL)
+
 include /usr/share/dpkg/default.mk
 
-# the Q3 engine's build system doesn't respect CPPFLAGS, so put them in CFLAGS
-CFLAGS += $(CPPFLAGS) -fsigned-char
+%:
+   dh $@
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+TARGET = release
+else
+TARGET = debug
+endif
 
 common_options = \
V=1 \
@@ -28,15 +39,10 @@ common_options = \
BUILD_GAME_SO=1 \
CROSS_COMPILING=1 \
VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
+   CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \
+   LDFLAGS='$(filter-out -fPIE -pie,$(LDFLAGS))' \
$(NULL)
 
-TARGET = release
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-# near enough
-TARGET = debug
-endif
-
 GAME_OPTIONS = \
BR=build/normal \
BD='$$(BR)' \
@@ -48,9 +54,6 @@ GAME_081_OPTIONS = \
OPENARENA_081_COMPATIBLE=1 \
$(NULL)
 
-%:
-   dh $@
-
 override_dh_auto_build:
dh_auto_build -- $(common_options) $(GAME_OPTIONS) $(TARGET)
dh_auto_build -- $(common_options) $(GAME_081_OPTIONS) $(TARGET)
@@ -78,57 +81,70 @@ override_dh_auto_clean:
rm -f debian/scripts/openarena
rm -f debian/scripts/openarena-server
 
+override_dh_auto_install: DESTDIR = debian/tmp
 override_dh_auto_install:
-   install -d debian/tmp/usr/games
-   install -d debian/tmp/usr/lib/openarena/baseoa/pak0/
-   install -d debian/tmp/usr/lib/openarena/baseoa/pak6-patch085/
-   install -d debian/tmp/usr/lib/openarena/baseoa/pak6-patch088/
-   install -d debian/tmp/usr/lib/openarena/missionpack/
-   install -d debian/tmp/usr/lib/openarena-server/baseoa/
-   install -d debian/tmp/usr/lib/openarena-server/missionpack/
+   install -d $(DESTDIR)/usr/games
+   install -d $(DESTDIR)/usr/lib/openarena/baseoa/pak0/
+   install -d $(DESTDIR)/usr/lib/openarena/baseoa/pak6-patch085/
+   install -d $(DESTDIR)/usr/lib/openarena/baseoa/pak6-patch088/
+   install -d $(DESTDIR)/usr/lib/openarena/missionpack/
+   install -d $(DESTDIR)/usr/lib/openarena-server/baseoa/
+   install -d $(DESTDIR)/usr/lib/openarena-server/missionpack/
# The client currently needs two builds:
# * one compatible with OA 0.8.1 pure servers
# * one compatible with OA 0.8.5 and 0.8.8 pure servers
# On impure servers, we default to the latest.
install -m644 build/0.8.1-compat/baseq3/*.so \
-   debian/tmp/usr/lib/openarena/baseoa/pak0/
+   $(DESTDIR)/usr/lib/openarena/baseoa/pak0/
install -m644 build/normal/baseq3/*.so \
-   debian/tmp/usr/lib/openarena/baseoa/pak6-patch088
-   ( cd debian/tmp/usr/lib/openarena/baseoa/pak6-patch085 && \
+   $(DESTDIR)/usr/lib/openarena/baseoa/pak6-patch088
+   ( cd $(DESTDIR)/usr/lib/openarena/baseoa/pak6-patch085 && \
ln -s ../pak6-patch088/*.so . )
-   ( cd debian/tmp/usr/lib/openarena/baseoa && \
+   ( cd $(DESTDIR)/usr/lib/openarena/baseoa && \
ln -s pak6-patch088/*.so . )
# The "mission pack" doesn't currently have incompatible versions so
# just use the latest
install -m644 build/normal/missionpack/*.so\
-   debian/tmp/usr/lib/openarena/missionpack/
+   $(DESTDIR)/usr/lib/openarena/missionpack/
# The server only needs the latest version, since it's the server
# that determines which version clients are expected to be
# 

[openarena] annotated tag debian/0.8.8-17 created (now 0965024)

[Simon McVittie]

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

smcv pushed a change to annotated tag debian/0.8.8-17
in repository openarena.

at  0965024   (tag)
   tagging  0e26825c27c11cab82db394574dc903c5813745e (commit)
  replaces  debian/0.8.8-16
 tagged by  Simon McVittie
on  Wed Sep 21 20:57:51 2016 +0100

- Log -
openarena Debian release 0.8.8-17
-BEGIN PGP SIGNATURE-

iQIcBAABCAAGBQJX4uY/AAoJEE3o/ypjx8yQtkQP/2Lh6h2N75hJxGpHjsof3dDp
DwLc8mLBHRse7tVRZmKZsyoHPclVDM+Iw4HvadXryaMu3qQ0eru6I5ZklrnZNarP
O3GNP+JwctNh0aHAFclNmQSgKR7O1P+/teAYmZ/KZxpk5jIYp7HmCtuuPPUTGrMQ
qcByiJFGfjFVxy6KY67h/w6WrXh6coyNjwfkzBqS8yyW8x6X7BSkoD9+eO+I5ZAa
zJKb8ZTmr0krvDvzmnrVow3xIsomVR9MjbafR5XR8UbQ66ue++2qQmRzkBKrT0s8
eRJ54sc/xT9WtHYNF3TwB4qHzctiLK074syLcs938PU9tJgIzU7X8zB61gaeSj7t
K+UjesTk31jdPD9DMqaCIXIDnzrsJ8U8WF9qb8F58TKwXvSXzEPgR+941Bp8VVb9
zszL+NljpRILFKkMklXTkqPNODYHRtTgpmsjrhNa9Mq00MxcAFchnh/SSlZXA0Wm
VExp46CVHoVGXOyStwSEPrtLrBbZqWys6ODtATMbDXd5gsPS+DSHPtXGJ1q9LUZE
zyZ6s41UsjuMglJEUFdOnj2MTPooEMUf6Sc3MmpH/qyleIWWU7SXyKy1VWKEUjiN
01iTUF66wPWDnb2i8OFZeHMjAGrzZdU5ZA9bxxP7POGVg6+acT5YQ8GjyjjZbS3+
4uPpVHFKSoStEBx0a5it
=BADT
-END PGP SIGNATURE-

Simon McVittie (5):
  Move to debhelper compat level 10
  Remove openarena-dbg, rely on automatic dbgsym packages instead
  debian/rules: align with ioquake3's
  Revert "Remove openarena-dbg, rely on automatic dbgsym packages instead"
  0.8.8-17

---

This annotated tag includes the following new commits:

   new  16241bf   Move to debhelper compat level 10
   new  37a4478   Remove openarena-dbg, rely on automatic dbgsym packages 
instead
   new  2bcf5e1   debian/rules: align with ioquake3's
   new  72b2c2c   Revert "Remove openarena-dbg, rely on automatic dbgsym 
packages instead"
   new  0e26825   0.8.8-17

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openarena] 01/05: Move to debhelper compat level 10

[Simon McVittie]

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

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

commit 16241bf7b7e2d6a95d5650c6d8ce696e21400247
Author: Simon McVittie 
Date:   Wed Sep 21 11:02:15 2016 +0100

Move to debhelper compat level 10

  - don't build in parallel explicitly, it is now the default
---
 debian/changelog | 7 +++
 debian/compat| 2 +-
 debian/control   | 2 +-
 debian/rules | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22dd383..233e8c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openarena (0.8.8-17) UNRELEASED; urgency=medium
+
+  * Move to debhelper compat level 10
+- don't build in parallel explicitly, it is now the default
+
+ -- Simon McVittie   Wed, 21 Sep 2016 11:01:51 +0100
+
 openarena (0.8.8-16) unstable; urgency=medium
 
   * Lock Debian-openarena account in purge instead of deleting it
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c41c358..bb8dc3f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Gonéri Le Bouder ,
  Simon McVittie ,
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  dpkg-dev (>= 1.16.1),
  ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index c21347c..fbdfccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ GAME_081_OPTIONS = \
$(NULL)
 
 %:
-   dh $@ --parallel
+   dh $@
 
 override_dh_auto_build:
dh_auto_build -- $(common_options) $(GAME_OPTIONS) $(TARGET)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] branch upstream/latest updated (7f70075 -> f9ef5eb)

[Simon McVittie]

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

smcv pushed a change to branch upstream/latest
in repository ioquake3.

  from  7f70075   Imported Upstream version 1.36+u20160616+dfsg1
   new  274fa89   Fix typo of empty in ai_main.c
   new  4474297   Fix bot team order to kill last player it killed
   new  0ad4381   Make using Yacc optional, disabled by default
   new  ebc7894   Fix OpenGL2 readme missing text in md
   new  251c983   OpenGL2: Require OpenGL 2.0.
   new  f0086e8   OpenGL2: Add new GL function loader.
   new  9a5add2   [tools/asm/q3asm.c] Remove 'abs(unsigned)', which is 
unnecessary and potentially wrong
   new  18d6c8f   [botlib] Use floating point absolute value rather than 
truncate to integer
   new  2ef99c8   Merge pull request #195 from tkoeppe/intfix
   new  7164381   OpenGL2: Use loader for all extension funcs.
   new  bbe99a8   [null/null_glimp.c] Fix up bitrot in null impl
   new  1051df4   Merge pull request #197 from tkoeppe/null
   new  e022abe   OpenGL2: Fix GL_EXT_direct_state_access function names.
   new  29ac117   OpenGL2: Let unlit materials use parallax maps.
   new  5252e28   OpenGL2: Fix shader error logs.
   new  1972128   Better defaults for joystick axes.
   new  d098668   Controller hot plug support.
   new  879fb55   Minor updates to README.md
   new  b7f2ebd   Better gamepad support.
   new  6262972   Fix stricmp usage in previous commit.
   new  f47aaa2   Minor URL change.
   new  1cf0b21   Fix black screen when in_joystick disabled but controller 
connected.
   new  fe8ac83   OpenGL2: Preallocate grid surfaces like other BSP 
surfaces.
   new  4ce600f   Missing bit of previous commit.
   new  4f9310d   Update SDL2 to 2.0.4
   new  e8c5b3a   Merge pull request #207 from MAN-AT-ARMS/sdl204
   new  966d39e   Add stripped SDL2 reference dll's to repo
   new  fb65e12   Merge pull request #212 from MAN-AT-ARMS/sdl204-stripped
   new  c5c01e7   Fix joystick w/o controller mapping not working with SDL 
update.
   new  3c8da8c   [game/ai_main.c] Use floating-point fabs() for 
floating-point values
   new  762f507   Merge pull request #213 from tkoeppe/abs
   new  dfbaf50   OpenGL2: Store normals/tangents as int16_t[4].
   new  f9e5712   OpenGL2: Fix missing bounds calculation when loading BSP 
surfaces.
   new  927c9cc   OpenGL2: Make R_FreeSurfaceGridMeshData() static.
   new  497a74f   Fix undefined behavior when shifting left by 32.
   new  ec37799   OpenGL2: Fix reversed VectorCopy4() usage.
   new  fe111df   [qcommon/msg.c] Remove dead code (which had undefined 
behaviour)
   new  7d063ba   Merge pull request #220 from tkoeppe/shift
   new  bbc9e26   OpenGL2: Fix more reversed VectorCopy4() usage.
   new  0eb72cd   [renderergl2/tr_main.c] Use floating-point fabsf() for 
floating-point values
   new  bd062f7   Merge pull request #216 from tkoeppe/abs
   new  90f2f02   [code/botlib/l_precomp.c] Fix string buffer overflow
   new  4c169ab   Merge pull request #221 from tkoeppe/strncpy
   new  4faf100   OpenGL2: Remove map color scaling and 
r_forceSunMapLightScale.
   new  8749d62   OpenGL2: Remove per fragment tangent space calculation 
code.
   new  8417c18   OpenGL2: Clamp entity lighting to more resemble OpenGL1.
   new  f9ef5eb   New upstream version 1.36+u20160914+dfsg1

The 47 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile   |  20 +
 README.md  |  14 +-
 code/botlib/be_aas_entity.c|   4 +-
 code/botlib/be_aas_move.c  |   2 +-
 code/botlib/be_aas_reach.c |   8 +-
 code/botlib/be_ai_move.c   |   2 +-
 code/botlib/l_precomp.c|   2 +-
 code/client/cl_input.c |  24 +-
 code/client/cl_keys.c  |  27 ++
 code/client/cl_main.c  |   6 +-
 code/client/keycodes.h |  30 ++
 code/game/ai_dmnet.c   |   3 +-
 code/game/ai_main.c|   6 +-
 code/null/null_glimp.c |  15 +-
 code/qcommon/msg.c |  66 +---
 code/renderercommon/qgl.h  | 371 ++
 code/renderergl1/tr_world.c|  10 +-
 code/renderergl2/glsl/lightall_fp.glsl |  29 --
 code/renderergl2/glsl/lightall_vp.glsl |  22 +-
 code/renderergl2/tr_animation.c|   2 +-
 code/renderergl2/tr_backend.c  |  31 +-
 code/renderergl2/tr_bsp.c  | 308 ++-
 code/renderergl2/tr_curve.c|  72 ++--
 code/renderergl2/tr_dsa.c  |  84 ++--
 code/renderergl2/tr_dsa.h  |  44 

[ioquake3] branch pristine-tar updated (e5c31d5 -> 83e29b6)

[Simon McVittie]

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

smcv pushed a change to branch pristine-tar
in repository ioquake3.

  from  e5c31d5   pristine-tar data for 
ioquake3_1.36+u20160122+dfsg1.orig.tar.xz
   new  148cb8c   pristine-tar data for 
ioquake3_1.36+u20160616+dfsg1.orig.tar.xz
   new  83e29b6   pristine-tar data for 
ioquake3_1.36+u20160914+dfsg1.orig.tar.xz

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta | Bin 0 -> 21063 bytes
 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id|   1 +
 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta | Bin 0 -> 21008 bytes
 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id|   1 +
 4 files changed, 2 insertions(+)
 create mode 100644 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta
 create mode 100644 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id
 create mode 100644 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta
 create mode 100644 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] annotated tag debian/1.36+u20160914+dfsg1-1 created (now b2000e0)

[Simon McVittie]

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

smcv pushed a change to annotated tag debian/1.36+u20160914+dfsg1-1
in repository ioquake3.

at  b2000e0   (tag)
   tagging  87e61120634fc5a5f028c04e623b3ce20fa43aa9 (commit)
  replaces  upstream/1.36+u20160914+dfsg1
 tagged by  Simon McVittie
on  Wed Sep 21 20:55:40 2016 +0100

- Log -
ioquake3 Debian release 1.36+u20160914+dfsg1-1
-BEGIN PGP SIGNATURE-

iQIcBAABCAAGBQJX4uW8AAoJEE3o/ypjx8yQAXcP/jdhPWmYGImTYR7prLbMY5hO
9y7bsxv9HIrg2F5NC10nDrp3vC81ovz+cebPIRMHhIPozx6PCqn8C/1u8aWxxM6w
vz8sobLaRoS6NJrQwkMBEwnt1ooSLvYkoNa9SBNObnVgDHjG0Jwk0em6GtbtP8kP
Ikecb9LqEM9iIClNyl5f9yyR51oOAAJLetqpZyN3MsCAQbNArRjpKpOPAbWVpcrr
AnmjO19fo+s8/kEP0EMx2B7p0rMBtYZub5eTvi7Cn4WFij3T6R+OYAQVSTR/3/uZ
BNrRw8HH03cxq9dYl1EtAzmG8hdMAUrH5nrpwXQyCfycneUEmBCjZp0u3zkEmEJV
l7TxW3ryVKCAas77wFIXrKl1xx7ZArSRF20v486p9b5FfsQj+yYEBYOVpG8DAACK
jHMfvlZobblPywzB+8BCSW8A7Is+GzDK+3dRsJcCsuCt+M8YkVddQqCIwuR0dwMq
2jv/dRmusHz5/xpselcJuJCnycBuqFqWcRB3Y4lclba4MWOiXmnuIcSL0WfxW1rY
VGdqZCPI8PiI+ePlSVF0IdSMKaFEVKfkyDDOv8xJOCeAQXuzKzrOuyZigI0CBEEa
I1KurYxnN2CS6z+fnycLivpaIFo0KwTOqfWZhwuy/ndrYmylcxrLYPX9AthUoS2C
aU9VKdy12VDVi7jqsnDf
=aIMt
-END PGP SIGNATURE-

Bruno Kleinert (12):
  Add debian/ directory
  openarena -> ioquake3 in server manpage
  Add patchset from personal repository
  Don't try to build internel speex code copy
  Fix deprecation warning about dh_clean -k
  dh_prep needs build dependency debhelper (>= 7)
  Install id-readme.txt in binary packages
  Information about packaging games for ioquake3
  Forgotten patches from my patchset
  Update debian changelog
  Script to export upstream sources from SVN
  Standards version an fix for deprecated version relation

Martin Michlmayr (1):
  debian/q3arch: add arm64 support

Simon McVittie (307):
  Reset changelog to UNRELEASED
  Update q3arch.sh from openarena 0.8.5
  control: untabify
  control: add myself to Uploaders
  Recommend a recent openarena
  ioquake3: suggest a matching ioquake3-server
  Install binaries outside the $PATH
  Update to debhelper 7 compat
  Convert debian/rules to dh style, and set variables as for openarena
  Add example wrapper scripts to run OpenArena with this engine
  Add a .gitignore for debian/
  Add patch to not check for pak0.pk3 when running standalone
  Avoid needing lcc by overriding make variables in rules, rather than by 
patching Makefile
  Don't patch out use of ~/.q3a
  Remove patch to fix strcpy abuse: newer versions from svn don't need this
  Remove patch that removes LOCAL_HEADERS stuff
  Remove fallback to baseq3/*.so
  Remove pioquake3 branding patch
  Remove patch to rename executables
  Remove patch to link against libcurl by default
  Revert removal of credits UI
  Revert removal of quake3world.com link
  Don't rename shared objects; only rename binaries at install time
  Remove Fedora patch working around empty fs_game from openarena servers
  Don't patch the default master server; we can change it on the command 
line
  Remove patch to turn off sv_pure by default
  Remove patch to default to shared objects
  Remove OA-specific pak0 check removal
  Remove patches to set an OpenArena-specific PROTOCOL_VERSION
  Adapt get-orig-source.sh to get a svn snapshot
  Refresh patch series
  Merge commit 'upstream/1.36+svn1788'
  New upstream version; rebase remaining patches
  Fix installation paths
  Improve patch tagging for system libjpeg patch
  Add my patch from openarena to fix division by zero if misconfigured
  Add patches allowing protocol to be changed on the command line
  Add patch for the ability to redirect from a stub QVM to native code
  Add patches to follow the normal search path for DLLs
  Add patches to increase arbitrary limits
  Add patch adding g_humanplayers and g_needpass to server info
  Save the Debian package version into the executable
  Remove patch to not ask for CD key for openarena
  Add patch from openarena for misspellings (ioq3 bug 4692)
  Add patch from openarena to fix ioquake3 on alpha
  Refresh patch queue
  Add patch indicating that kFreeBSD is basically like Linux for our 
purposes
  Add an example wrapper script for vanilla Quake 3
  Update changelog and package descriptions
  Adjust README.Debian: the proprietary game does, in fact, seem to work
  Tag patches that I've sent upstream
  Simplify regex for debian_version, and include distro name in VERSION
  Don't omit libjpeg from the repacked "orig" tarball
  Merge commit 'upstream/1.36+svn1788j'
  Standards-Version: 3.9.1 (no changes)
  Convert debian/copyright to DEP-5 and generally chase copyright statements
  Add a watch file
 

[ioquake3] 02/02: pristine-tar data for ioquake3_1.36+u20160914+dfsg1.orig.tar.xz

[Simon McVittie]

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

smcv pushed a commit to branch pristine-tar
in repository ioquake3.

commit 83e29b6ca58c9efd6eb2d0e09beec425f09d2dcf
Author: Simon McVittie 
Date:   Wed Sep 21 10:44:39 2016 +0100

pristine-tar data for ioquake3_1.36+u20160914+dfsg1.orig.tar.xz
---
 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta | Bin 0 -> 21008 bytes
 ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta 
b/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta
new file mode 100644
index 000..86a1e08
Binary files /dev/null and b/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.delta 
differ
diff --git a/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id 
b/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id
new file mode 100644
index 000..cd3a17f
--- /dev/null
+++ b/ioquake3_1.36+u20160914+dfsg1.orig.tar.xz.id
@@ -0,0 +1 @@
+78c0c08adafdbf0240872a0c7802ebdd58aacb95

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 59/59: 1.36+u20160914+dfsg1-1

[Simon McVittie]

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

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

commit 87e61120634fc5a5f028c04e623b3ce20fa43aa9
Author: Simon McVittie 
Date:   Wed Sep 21 20:34:37 2016 +0100

1.36+u20160914+dfsg1-1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af29cce..adede0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20160914+dfsg1-1) unstable; urgency=medium
 
   * New upstream snapshot
 - bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
@@ -15,7 +15,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
 fix spellings
   * debian/apparmor.d: allow mapping objects from /usr/lib/openarena-server
 
- -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
+ -- Simon McVittie   Wed, 21 Sep 2016 20:34:26 +0100
 
 ioquake3 (1.36+u20160616+dfsg1-1) unstable; urgency=medium
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 01/02: pristine-tar data for ioquake3_1.36+u20160616+dfsg1.orig.tar.xz

[Simon McVittie]

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

smcv pushed a commit to branch pristine-tar
in repository ioquake3.

commit 148cb8cd1b4b7766ea007b5bc257fcc58ecebd07
Author: Simon McVittie 
Date:   Mon Jun 27 10:32:11 2016 +0100

pristine-tar data for ioquake3_1.36+u20160616+dfsg1.orig.tar.xz
---
 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta | Bin 0 -> 21063 bytes
 ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta 
b/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta
new file mode 100644
index 000..fba52ce
Binary files /dev/null and b/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.delta 
differ
diff --git a/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id 
b/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id
new file mode 100644
index 000..5f5627c
--- /dev/null
+++ b/ioquake3_1.36+u20160616+dfsg1.orig.tar.xz.id
@@ -0,0 +1 @@
+2ece856aceade5f554b4fc4e07bd3f9872fd1ead

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 58/59: debian/apparmor.d: allow mapping objects from /usr/lib/openarena-server

[Simon McVittie]

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

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

commit 652ef1535b8e3af29e96e6b9ed2b3e77da4c1a36
Author: Simon McVittie 
Date:   Wed Sep 21 20:29:06 2016 +0100

debian/apparmor.d: allow mapping objects from /usr/lib/openarena-server
---
 debian/apparmor.d/usr.lib.ioquake3.ioq3ded | 2 +-
 debian/changelog   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioq3ded 
b/debian/apparmor.d/usr.lib.ioquake3.ioq3ded
index f8cc388..4859dc5 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioq3ded
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioq3ded
@@ -17,7 +17,7 @@
   network inet6 stream,
 
   /etc/{openarena,quake3}-server/** r,
-  /usr/lib/{ioquake3,quake3,openarena}/** mr,
+  /usr/lib/{ioquake3,quake3,openarena,openarena-server}/** mr,
   /usr/share/games/{quake3*,openarena}/** r,
 
   owner @{HOME}/.{openarena,q3a}/{,**} rwk,
diff --git a/debian/changelog b/debian/changelog
index 4724ae3..af29cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   * debian/rules: re-indent options
   * d/p/Fix-mis-spellings-of-separating-as-seperating.patch:
 fix spellings
+  * debian/apparmor.d: allow mapping objects from /usr/lib/openarena-server
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 55/59: debian/rules: mark get-orig-source as a phony target

[Simon McVittie]

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

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

commit 4ff12c49c9e0b92161fed9378bff5c816e263346
Author: Simon McVittie 
Date:   Wed Sep 21 11:09:26 2016 +0100

debian/rules: mark get-orig-source as a phony target
---
 debian/changelog | 1 +
 debian/rules | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f31aca..92eb54f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   * Remove ioquake3-dbg, rely on automatic dbgsym packages instead
   * Bump debhelper compat level to 10
 - don't explicitly do a parallel build, it is the default
+  * debian/rules: mark get-orig-source as a phony target
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/rules b/debian/rules
index d4b34d8..5919204 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,7 @@ else
ORIG_EXPORT := ${ORIG_REV}
 endif
 
+.PHONY: get-orig-source
 get-orig-source:
git clone --bare --depth=1 ${ORIG_REPO} ${ORIG_SOURCE}-${ORIG_VER}.git
GIT_DIR=${ORIG_SOURCE}-${ORIG_VER}.git git fetch ${ORIG_REPO} 
${ORIG_EXPORT}

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 57/59: d/p/Fix-mis-spellings-of-separating-as-seperating.patch: fix spellings

[Simon McVittie]

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

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

commit 56d9b718965389867652cd1695dbd2cbfdfe1f44
Author: Simon McVittie 
Date:   Wed Sep 21 20:15:50 2016 +0100

d/p/Fix-mis-spellings-of-separating-as-seperating.patch: fix spellings
---
 debian/changelog   |  2 +
 ...mis-spellings-of-separating-as-seperating.patch | 66 ++
 ...HLIBLDFLAGS-used-to-link-executables-only.patch |  8 +--
 ...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch |  4 +-
 ...-a-window-by-default-on-new-installations.patch |  4 +-
 debian/patches/series  |  1 +
 6 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8bc6fe..4724ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
 - don't explicitly do a parallel build, it is the default
   * debian/rules: mark get-orig-source as a phony target
   * debian/rules: re-indent options
+  * d/p/Fix-mis-spellings-of-separating-as-seperating.patch:
+fix spellings
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch 
b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
new file mode 100644
index 000..55a5bef
--- /dev/null
+++ b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
@@ -0,0 +1,66 @@
+From: Simon McVittie 
+Date: Wed, 21 Sep 2016 20:15:01 +0100
+Subject: Fix mis-spellings of "separating" as "seperating"
+
+Found by Debian's Lintian tool.
+---
+ code/botlib/aasfile.h| 4 ++--
+ code/botlib/be_aas_cluster.c | 2 +-
+ code/qcommon/cm_trace.c  | 2 +-
+ code/qcommon/common.c| 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/code/botlib/aasfile.h b/code/botlib/aasfile.h
+index 8f2fbf6..a0593df 100644
+--- a/code/botlib/aasfile.h
 b/code/botlib/aasfile.h
+@@ -65,8 +65,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
+ #define FACE_LADDER   2   //ladder
+ #define FACE_GROUND   4   
//standing on ground when in this face
+ #define FACE_GAP  8   //gap 
in the ground
+-#define FACE_LIQUID   16  //face 
seperating two areas with liquid
+-#define FACE_LIQUIDSURFACE32  //face 
seperating liquid and air
++#define FACE_LIQUID   16  //face 
separating two areas with liquid
++#define FACE_LIQUIDSURFACE32  //face 
separating liquid and air
+ #define FACE_BRIDGE   64  //can 
walk over this face if bridge is closed
+ 
+ //area contents
+diff --git a/code/botlib/be_aas_cluster.c b/code/botlib/be_aas_cluster.c
+index 013e806..c2fed97 100644
+--- a/code/botlib/be_aas_cluster.c
 b/code/botlib/be_aas_cluster.c
+@@ -152,7 +152,7 @@ int AAS_UpdatePortal(int areanum, int clusternum)
+   {
+   //remove the cluster portal flag contents
+   aasworld.areasettings[areanum].contents &= 
~AREACONTENTS_CLUSTERPORTAL;
+-  Log_Write("portal area %d is seperating more than two 
clusters\r\n", areanum);
++  Log_Write("portal area %d is separating more than two 
clusters\r\n", areanum);
+   return qfalse;
+   } //end else
+   if (aasworld.portalindexsize >= AAS_MAX_PORTALINDEXSIZE)
+diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
+index a4ac80a..e6ca055 100644
+--- a/code/qcommon/cm_trace.c
 b/code/qcommon/cm_trace.c
+@@ -1053,7 +1053,7 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, 
float p1f, float p2f, vec3_t
+   }
+ 
+   //
+-  // find the point distances to the seperating plane
++  // find the point distances to the separating plane
+   // and the offset for the size of the box
+   //
+   node = cm.nodes + num;
+diff --git a/code/qcommon/common.c b/code/qcommon/common.c
+index 70a6b1b..80dd2c3 100644
+--- a/code/qcommon/common.c
 b/code/qcommon/common.c
+@@ -411,7 +411,7 @@ void Com_ParseCommandLine( char *commandLine ) {
+ if (*commandLine == '"') {
+ inq = !inq;
+ }
+-// look for a + seperating character
++// look for a + separating character
+ // if commandLine came from a file, we might have real line seperators
+ if ( (*commandLine == '+' && !inq) || *commandLine == '\n'  || 
*commandLine == '\r' ) {
+ if ( com_numConsoleLines == MAX_CONSOLE_LINES ) {
diff --git 

[ioquake3] 51/59: New upstream snapshot

[Simon McVittie]

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

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

commit bb1c527b2f71677f81e15890923007aa1bfd72f5
Author: Simon McVittie 
Date:   Wed Sep 21 10:45:36 2016 +0100

New upstream snapshot

  - bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
code copy
---
 debian/changelog |  5 -
 debian/control   |  2 +-
 debian/rules | 52 +++-
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0404a9b..263e9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-ioquake3 (1.36+u20160616+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot
+- bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
+  code copy
   * debian/watch: mangle Debian version correctly
   * Remove a leftover comment which is now misleading
 
diff --git a/debian/control b/debian/control
index 5910850..bee30fa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libopenal-dev,
  libopus-dev,
  libopusfile-dev,
- libsdl2-dev (>= 2.0.0),
+ libsdl2-dev (>= 2.0.4),
  libvorbis-dev,
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/ioquake3.git
diff --git a/debian/rules b/debian/rules
index 84edd51..f8e17ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,13 +80,14 @@ override_dh_strip:
 
 # ---
 
-ORIG_REPO ?= https://github.com/ioquake/ioq3/
+ORIG_SOURCE = ioquake3
+ORIG_REPO ?= https://github.com/ioquake/ioq3
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = 9d6a95d4ad141237e21e5c57281b099bbc27a072
+ORIG_REV = 8417c184b42bd2d97f57b428b56c3c039531853b
 # Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
 # or empty if ORIG_REV is
-ORIG_DATE = 20160616
+ORIG_DATE = 20160914
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
@@ -103,32 +104,33 @@ else
 endif
 
 get-orig-source:
-   git clone --bare --branch master ${ORIG_REPO} ioquake3-${ORIG_VER}.git
-   GIT_DIR=ioquake3-${ORIG_VER}.git git archive \
+   git clone --bare --depth=1 ${ORIG_REPO} ${ORIG_SOURCE}-${ORIG_VER}.git
+   GIT_DIR=${ORIG_SOURCE}-${ORIG_VER}.git git fetch ${ORIG_REPO} 
${ORIG_EXPORT}
+   GIT_DIR=${ORIG_SOURCE}-${ORIG_VER}.git git archive \
--format=tar \
-   --prefix=ioquake3-${ORIG_VER}.orig/ \
-   ${ORIG_EXPORT} | tar -xvf-
-   rm -rf ioquake3-${ORIG_VER}.orig/code/AL
-   rm -rf ioquake3-${ORIG_VER}.orig/code/SDL12
-   rm -rf ioquake3-${ORIG_VER}.orig/code/SDL2
-   rm -rf ioquake3-${ORIG_VER}.orig/code/tools/lcc
-   rm -rf ioquake3-${ORIG_VER}.orig/code/jpeg-8c
-   rm -rf ioquake3-${ORIG_VER}.orig/code/libcurl*
-   rm -rf ioquake3-${ORIG_VER}.orig/code/libogg-*
-   rm -rf ioquake3-${ORIG_VER}.orig/code/libs
-   rm -rf ioquake3-${ORIG_VER}.orig/code/libspeex
-   rm -rf ioquake3-${ORIG_VER}.orig/code/libvorbis-*
-   rm -rf ioquake3-${ORIG_VER}.orig/code/opus-*
-   rm -rf ioquake3-${ORIG_VER}.orig/code/opusfile-*
-   rm -rf ioquake3-${ORIG_VER}.orig/code/zlib
-   tar --xz -cvf ioquake3_${ORIG_VER}.orig.tar.xz ioquake3-${ORIG_VER}.orig
-   rm -rf ioquake3-${ORIG_VER}.orig
-   rm -rf ioquake3-${ORIG_VER}.git
+   --prefix=${ORIG_SOURCE}-${ORIG_VER}.orig/ \
+   ${ORIG_EXPORT} | tar -xf-
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/AL
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/SDL12
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/SDL2
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/tools/lcc
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/jpeg-8c
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libcurl*
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libogg-*
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libs
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libspeex
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libvorbis-*
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/opus-*
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/opusfile-*
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/zlib
+   tar --xz -cvf ${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz 
${ORIG_SOURCE}-${ORIG_VER}.orig
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig
+   rm -rf ${ORIG_SOURCE}-${ORIG_VER}.git
 
 # to be invoked from a git checkout with upstream github as a remote;
 # tarball ends up in ../build-area
 maintainer-get-orig-source:
$(MAKE) -f debian/rules get-orig-source ORIG_REPO=$$(pwd)/.git
-   mv -i -v ${DEB_SOURCE}_${ORIG_VER}.orig.tar.xz ../build-area/
+   mv -i -v ${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz ../build-area/
@echo "try using:"
-   @echo "gbp 

[ioquake3] 56/59: debian/rules: re-indent options

[Simon McVittie]

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

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

commit 76a29a24cd7dff7a0e57bf0b5572d3b55476d50e
Author: Simon McVittie 
Date:   Wed Sep 21 11:20:29 2016 +0100

debian/rules: re-indent options
---
 debian/changelog |  1 +
 debian/rules | 50 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92eb54f..f8bc6fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 10
 - don't explicitly do a parallel build, it is the default
   * debian/rules: mark get-orig-source as a phony target
+  * debian/rules: re-indent options
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/rules b/debian/rules
index 5919204..7009f59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,31 +25,31 @@ TARGET = debug
 endif
 
 OPTIONS := \
-   BR=build \
-   BD=build \
-   V=1 \
-   USE_CODEC_OPUS=1 \
-   USE_CODEC_VORBIS=1 \
-   USE_CURL=1 \
-   USE_CURL_DLOPEN=0 \
-   USE_INTERNAL_LIBS=0 \
-   USE_LOCAL_HEADERS=0 \
-   USE_OPENAL=1 \
-   USE_OPENAL_DLOPEN=0 \
-   USE_VOIP=1 \
-   $(shell $(CURDIR)/debian/q3arch make ${DEB_HOST_GNU_CPU} 
${DEB_HOST_GNU_SYSTEM}) \
-   BUILD_CLIENT_SMP=1 \
-   DEFAULT_BASEDIR=/usr/lib/ioquake3 \
-   BUILD_GAME_SO=1 \
-   BUILD_GAME_QVM=0 \
-   VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
-   CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \
-   NOTSHLIBCFLAGS='$(filter -fPIE -pie,$(CFLAGS))' \
-   LDFLAGS='$(filter-out -fPIE -pie,$(LDFLAGS))' \
-   NOTSHLIBLDFLAGS='$(filter -fPIE -pie,$(LDFLAGS))' \
-   FULLBINEXT="" \
-   NO_STRIP=1 \
-   $(NULL)
+   BR=build \
+   BD=build \
+   V=1 \
+   USE_CODEC_OPUS=1 \
+   USE_CODEC_VORBIS=1 \
+   USE_CURL=1 \
+   USE_CURL_DLOPEN=0 \
+   USE_INTERNAL_LIBS=0 \
+   USE_LOCAL_HEADERS=0 \
+   USE_OPENAL=1 \
+   USE_OPENAL_DLOPEN=0 \
+   USE_VOIP=1 \
+   $(shell $(CURDIR)/debian/q3arch make ${DEB_HOST_GNU_CPU} 
${DEB_HOST_GNU_SYSTEM}) \
+   BUILD_CLIENT_SMP=1 \
+   DEFAULT_BASEDIR=/usr/lib/ioquake3 \
+   BUILD_GAME_SO=1 \
+   BUILD_GAME_QVM=0 \
+   VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
+   CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \
+   NOTSHLIBCFLAGS='$(filter -fPIE -pie,$(CFLAGS))' \
+   LDFLAGS='$(filter-out -fPIE -pie,$(LDFLAGS))' \
+   NOTSHLIBLDFLAGS='$(filter -fPIE -pie,$(LDFLAGS))' \
+   FULLBINEXT="" \
+   NO_STRIP=1 \
+   $(NULL)
 
 override_dh_auto_build:
dh_auto_build -- $(OPTIONS) $(TARGET)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 54/59: Bump debhelper compat level to 10

[Simon McVittie]

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

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

commit 7cfed5d749a940c68ab51454c42e3bf9bd954722
Author: Simon McVittie 
Date:   Wed Sep 21 10:59:03 2016 +0100

Bump debhelper compat level to 10

  - don't explicitly do a parallel build, it is the default
---
 debian/changelog | 2 ++
 debian/compat| 2 +-
 debian/control   | 2 +-
 debian/rules | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25d173a..4f31aca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   * debian/watch: mangle Debian version correctly
   * Remove a leftover comment which is now misleading
   * Remove ioquake3-dbg, rely on automatic dbgsym packages instead
+  * Bump debhelper compat level to 10
+- don't explicitly do a parallel build, it is the default
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index e850a33..57bf320 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Bruno "Fuddl" Kleinert ,
  Simon McVittie ,
 Build-Depends:
- debhelper (>= 9.20160114),
+ debhelper (>= 10),
  dh-apparmor [linux-any],
  dpkg-dev (>= 1.16.1),
  libcurl4-gnutls-dev,
diff --git a/debian/rules b/debian/rules
index 642bfe4..d4b34d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ DEB_CFLAGS_MAINT_APPEND := \
 include /usr/share/dpkg/default.mk
 
 %:
-   dh $@ --parallel
+   dh $@
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 TARGET = release

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 53/59: Mention improved get-orig-source in changelog

[Simon McVittie]

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

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

commit b5a8997e3b24dcb277b1da8ddab4ee696c3c5133
Author: Simon McVittie 
Date:   Wed Sep 21 10:52:02 2016 +0100

Mention improved get-orig-source in changelog
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 5136858..25d173a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   * New upstream snapshot
 - bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
   code copy
+- debian/rules: improve get-orig-source target
   * debian/watch: mangle Debian version correctly
   * Remove a leftover comment which is now misleading
   * Remove ioquake3-dbg, rely on automatic dbgsym packages instead

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 52/59: Remove ioquake3-dbg, rely on automatic dbgsym packages instead

[Simon McVittie]

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

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

commit 87594a58b03b850569357543b3823954b4fb0e73
Author: Simon McVittie 
Date:   Wed Sep 21 10:48:47 2016 +0100

Remove ioquake3-dbg, rely on automatic dbgsym packages instead
---
 debian/changelog |  1 +
 debian/control   | 14 +-
 debian/rules |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 263e9da..5136858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
   code copy
   * debian/watch: mangle Debian version correctly
   * Remove a leftover comment which is now misleading
+  * Remove ioquake3-dbg, rely on automatic dbgsym packages instead
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/control b/debian/control
index bee30fa..e850a33 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Bruno "Fuddl" Kleinert ,
  Simon McVittie ,
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 9.20160114),
  dh-apparmor [linux-any],
  dpkg-dev (>= 1.16.1),
  libcurl4-gnutls-dev,
@@ -39,18 +39,6 @@ Description: Game engine for 3D first person shooter games
  This package alone isn't of any use; to get a playable game, install
  openarena or another suitable set of game data.
 
-Package: ioquake3-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
- ioquake3-server (= ${binary:Version}),
- ${misc:Depends},
-Description: debug symbols for the ioquake3 game engine
- This package contains debug symbols for the ioQuake3 game engine,
- which can be used to analyze crashes in games that use Debian's shared
- ioquake engine.
-
 Package: ioquake3-server
 Architecture: any
 Depends:
diff --git a/debian/rules b/debian/rules
index f8e17ed..642bfe4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ override_dh_install-arch:
 endif
 
 override_dh_strip:
-   dh_strip --dbg-package=ioquake3-dbg
+   dh_strip --ddeb-migration='ioquake3-dbg (<< 1.36+u20160914+dfsg1-1~)'
 
 # ---
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 47/59: debian/watch: mangle Debian version correctly

[Simon McVittie]

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

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

commit 5932a11fb5632f56749a42edc80e49702bde2e5b
Author: Simon McVittie 
Date:   Wed Sep 21 10:22:15 2016 +0100

debian/watch: mangle Debian version correctly
---
 debian/changelog | 6 ++
 debian/watch | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a934aed..bb3856a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ioquake3 (1.36+u20160616+dfsg1-2) UNRELEASED; urgency=medium
+
+  * debian/watch: mangle Debian version correctly
+
+ -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
+
 ioquake3 (1.36+u20160616+dfsg1-1) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/watch b/debian/watch
index e6c65c1..0b4dd98 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
-opts=dversionmangle=s/(\+u[0-9]+\+g[a-f0-9]+)?\+(dfsg|ds)[0-9]+$// \
+opts=dversionmangle=s/(\+u[0-9]+)?\+(dfsg|ds)[0-9]+$// \
 http://ioquake3.org/files/([\d\.]+)/ioquake3-([\d\.]+)\.tar\.bz2
 
 # Note to uploaders: upstream tarballs are not currently DFSG-free. Update and

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 46/59: OpenGL2: Clamp entity lighting to more resemble OpenGL1.

[Simon McVittie]

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

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

commit 8417c184b42bd2d97f57b428b56c3c039531853b
Author: SmileTheory 
Date:   Wed Sep 14 04:19:46 2016 -0700

OpenGL2: Clamp entity lighting to more resemble OpenGL1.
---
 code/renderergl2/tr_light.c | 38 --
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index a335eb6..1bf1eb7 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -385,16 +385,42 @@ void R_SetupEntityLighting( const trRefdef_t *refdef, 
trRefEntity_t *ent ) {
VectorMA( lightDir, d, dir, lightDir );
}
 
-   // clamp ambient
-   if ( !r_hdr->integer )
+   // clamp lights
+   // FIXME: old renderer clamps (ambient + NL * directed) per vertex
+   //check if that's worth implementing
{
-   for ( i = 0 ; i < 3 ; i++ ) {
-   if ( ent->ambientLight[i] > tr.identityLightByte ) {
-   ent->ambientLight[i] = tr.identityLightByte;
-   }
+   float r, g, b, max;
+
+   r = ent->ambientLight[0];
+   g = ent->ambientLight[1];
+   b = ent->ambientLight[2];
+
+   max = MAX(MAX(r, g), b);
+
+   if (max > 255.0f)
+   {
+   max = 255.0f / max;
+   ent->ambientLight[0] *= max;
+   ent->ambientLight[1] *= max;
+   ent->ambientLight[2] *= max;
+   }
+
+   r = ent->directedLight[0];
+   g = ent->directedLight[1];
+   b = ent->directedLight[2];
+
+   max = MAX(MAX(r, g), b);
+
+   if (max > 255.0f)
+   {
+   max = 255.0f / max;
+   ent->directedLight[0] *= max;
+   ent->directedLight[1] *= max;
+   ent->directedLight[2] *= max;
}
}
 
+
if ( r_debugLight->integer ) {
LogLight( ent );
}

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 49/59: New upstream version 1.36+u20160914+dfsg1

[Simon McVittie]

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

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

commit f9ef5ebae1d8ebed63e7e18bbf7e98a41c72d325
Merge: 7f70075 8417c18
Author: Simon McVittie 
Date:   Wed Sep 21 10:44:34 2016 +0100

New upstream version 1.36+u20160914+dfsg1

 Makefile   |  20 +
 README.md  |  14 +-
 code/botlib/be_aas_entity.c|   4 +-
 code/botlib/be_aas_move.c  |   2 +-
 code/botlib/be_aas_reach.c |   8 +-
 code/botlib/be_ai_move.c   |   2 +-
 code/botlib/l_precomp.c|   2 +-
 code/client/cl_input.c |  24 +-
 code/client/cl_keys.c  |  27 ++
 code/client/cl_main.c  |   6 +-
 code/client/keycodes.h |  30 ++
 code/game/ai_dmnet.c   |   3 +-
 code/game/ai_main.c|   6 +-
 code/null/null_glimp.c |  15 +-
 code/qcommon/msg.c |  66 +---
 code/renderercommon/qgl.h  | 371 ++
 code/renderergl1/tr_world.c|  10 +-
 code/renderergl2/glsl/lightall_fp.glsl |  29 --
 code/renderergl2/glsl/lightall_vp.glsl |  22 +-
 code/renderergl2/tr_animation.c|   2 +-
 code/renderergl2/tr_backend.c  |  31 +-
 code/renderergl2/tr_bsp.c  | 308 ++-
 code/renderergl2/tr_curve.c|  72 ++--
 code/renderergl2/tr_dsa.c  |  84 ++--
 code/renderergl2/tr_dsa.h  |  44 +--
 code/renderergl2/tr_extensions.c   | 687 +
 code/renderergl2/tr_fbo.c  |  14 +-
 code/renderergl2/tr_glsl.c | 229 +--
 code/renderergl2/tr_image.c|  59 ++-
 code/renderergl2/tr_init.c |  14 +-
 code/renderergl2/tr_light.c|  38 +-
 code/renderergl2/tr_local.h|  65 ++--
 code/renderergl2/tr_main.c | 379 ++
 code/renderergl2/tr_marks.c|  23 +-
 code/renderergl2/tr_model.c| 101 +++--
 code/renderergl2/tr_model_iqm.c|  21 +-
 code/renderergl2/tr_postprocess.c  |   4 +-
 code/renderergl2/tr_scene.c|   6 -
 code/renderergl2/tr_shade.c|  88 ++---
 code/renderergl2/tr_shade_calc.c   |  24 +-
 code/renderergl2/tr_shader.c   |   8 +-
 code/renderergl2/tr_sky.c  |   2 +-
 code/renderergl2/tr_surface.c  | 425 +++-
 code/renderergl2/tr_vbo.c  | 245 
 code/renderergl2/tr_world.c|  22 +-
 code/sdl/sdl_input.c   | 251 +++-
 code/tools/asm/q3asm.c |   2 +-
 misc/linux/server_compile.sh   |   2 +-
 opengl2-readme.md  |  76 ++--
 49 files changed, 1380 insertions(+), 2607 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 45/59: OpenGL2: Remove per fragment tangent space calculation code.

[Simon McVittie]

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

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

commit 8749d62bbd1992e938bc25aa28f319ba4b9a1244
Author: SmileTheory 
Date:   Wed Sep 14 03:57:51 2016 -0700

OpenGL2: Remove per fragment tangent space calculation code.
---
 code/renderergl2/glsl/lightall_fp.glsl | 29 -
 code/renderergl2/glsl/lightall_vp.glsl | 22 --
 code/renderergl2/tr_bsp.c  |  6 --
 code/renderergl2/tr_curve.c|  8 
 code/renderergl2/tr_glsl.c |  5 -
 code/renderergl2/tr_local.h| 12 
 code/renderergl2/tr_main.c |  2 --
 code/renderergl2/tr_model.c| 14 --
 code/renderergl2/tr_model_iqm.c|  6 --
 code/renderergl2/tr_shade.c|  2 --
 code/renderergl2/tr_shader.c   |  2 --
 code/renderergl2/tr_surface.c  | 11 +--
 code/renderergl2/tr_vbo.c  | 16 
 13 files changed, 5 insertions(+), 130 deletions(-)

diff --git a/code/renderergl2/glsl/lightall_fp.glsl 
b/code/renderergl2/glsl/lightall_fp.glsl
index 9e53d4a..531267c 100644
--- a/code/renderergl2/glsl/lightall_fp.glsl
+++ b/code/renderergl2/glsl/lightall_fp.glsl
@@ -53,14 +53,9 @@ varying vec4  var_ColorAmbient;
 #endif
 
 #if (defined(USE_LIGHT) && !defined(USE_FAST_LIGHT))
-  #if defined(USE_VERT_TANGENT_SPACE)
 varying vec4   var_Normal;
 varying vec4   var_Tangent;
 varying vec4   var_Bitangent;
-  #else
-varying vec3   var_Normal;
-varying vec3   var_ViewDir;
-  #endif
 #endif
 
 #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
@@ -196,25 +191,6 @@ float CalcLightAttenuation(float point, float normDist)
return attenuation;
 }
 
-// from http://www.thetenthplanet.de/archives/1180
-mat3 cotangent_frame( vec3 N, vec3 p, vec2 uv )
-{
-   // get edge vectors of the pixel triangle
-   vec3 dp1 = dFdx( p );
-   vec3 dp2 = dFdy( p );
-   vec2 duv1 = dFdx( uv );
-   vec2 duv2 = dFdy( uv );
-
-   // solve the linear system
-   vec3 dp2perp = cross( dp2, N );
-   vec3 dp1perp = cross( N, dp1 );
-   vec3 T = dp2perp * duv1.x + dp1perp * duv2.x;
-   vec3 B = dp2perp * duv1.y + dp1perp * duv2.y;
-
-   // construct a scale-invariant frame 
-   float invmax = inversesqrt( max( dot(T,T), dot(B,B) ) );
-   return mat3( T * invmax, B * invmax, N );
-}
 
 void main()
 {
@@ -223,13 +199,8 @@ void main()
float NL, NH, NE, EH, attenuation;
 
 #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
-  #if defined(USE_VERT_TANGENT_SPACE)
mat3 tangentToWorld = mat3(var_Tangent.xyz, var_Bitangent.xyz, 
var_Normal.xyz);
viewDir = vec3(var_Normal.w, var_Tangent.w, var_Bitangent.w);
-  #else
-   mat3 tangentToWorld = cotangent_frame(var_Normal, -var_ViewDir, 
var_TexCoords.xy);
-   viewDir = var_ViewDir;
-  #endif
E = normalize(viewDir);
 #endif
 
diff --git a/code/renderergl2/glsl/lightall_vp.glsl 
b/code/renderergl2/glsl/lightall_vp.glsl
index 783885e..e5b3c4f 100644
--- a/code/renderergl2/glsl/lightall_vp.glsl
+++ b/code/renderergl2/glsl/lightall_vp.glsl
@@ -6,16 +6,12 @@ attribute vec4 attr_Color;
 
 attribute vec3 attr_Position;
 attribute vec3 attr_Normal;
-#if defined(USE_VERT_TANGENT_SPACE)
 attribute vec4 attr_Tangent;
-#endif
 
 #if defined(USE_VERTEX_ANIMATION)
 attribute vec3 attr_Position2;
 attribute vec3 attr_Normal2;
-  #if defined(USE_VERT_TANGENT_SPACE)
 attribute vec4 attr_Tangent2;
-  #endif
 #endif
 
 #if defined(USE_LIGHT) && !defined(USE_LIGHT_VECTOR)
@@ -74,14 +70,9 @@ varying vec4   var_ColorAmbient;
 #endif
 
 #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
-  #if defined(USE_VERT_TANGENT_SPACE)
 varying vec4   var_Normal;
 varying vec4   var_Tangent;
 varying vec4   var_Bitangent;
-  #else
-varying vec3   var_Normal;
-varying vec3   var_ViewDir;
-  #endif
 #endif
 
 #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
@@ -157,13 +148,13 @@ void main()
 #if defined(USE_VERTEX_ANIMATION)
vec3 position  = mix(attr_Position,attr_Position2,u_VertexLerp);
vec3 normal= mix(attr_Normal,  attr_Normal2,  u_VertexLerp);
-  #if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && 
!defined(USE_FAST_LIGHT)
+  #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 tangent   = mix(attr_Tangent.xyz, attr_Tangent2.xyz, u_VertexLerp);
   #endif
 #else
vec3 position  = attr_Position;
vec3 normal= attr_Normal;
-  #if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && 
!defined(USE_FAST_LIGHT)
+  #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 tangent   = attr_Tangent.xyz;
   #endif
 #endif
@@ -185,12 +176,12 @@ void main()
 #if defined(USE_MODELMATRIX)
position  = (u_ModelMatrix * vec4(position, 1.0)).xyz;
normal= (u_ModelMatrix * vec4(normal,   0.0)).xyz;
- 

[ioquake3] 48/59: Remove a leftover comment which is now misleading

[Simon McVittie]

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

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

commit 7709223769a92756bdaf3c1176aeed5bb228e9c6
Author: Simon McVittie 
Date:   Wed Sep 21 10:38:16 2016 +0100

Remove a leftover comment which is now misleading
---
 debian/changelog | 1 +
 debian/rules | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb3856a..0404a9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ioquake3 (1.36+u20160616+dfsg1-2) UNRELEASED; urgency=medium
 
   * debian/watch: mangle Debian version correctly
+  * Remove a leftover comment which is now misleading
 
  -- Simon McVittie   Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/rules b/debian/rules
index e06d519..84edd51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,6 @@ else
 TARGET = debug
 endif
 
-# LIBSDLMAIN would normally be empty; we (ab)use it as a convenient variable
-# that is passed to the linker if and only if linking the executable
 OPTIONS := \
BR=build \
BD=build \

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 50/59: Merge tag 'upstream/1.36+u20160914+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 ioquake3.

commit aeaad309408161572d04a27fdcdd3b249cc72b27
Merge: 7709223 f9ef5eb
Author: Simon McVittie 
Date:   Wed Sep 21 10:44:40 2016 +0100

Merge tag 'upstream/1.36+u20160914+dfsg1' into debian/master

Upstream version 1.36+u20160914+dfsg1

 Makefile   |  20 +
 README.md  |  14 +-
 code/botlib/be_aas_entity.c|   4 +-
 code/botlib/be_aas_move.c  |   2 +-
 code/botlib/be_aas_reach.c |   8 +-
 code/botlib/be_ai_move.c   |   2 +-
 code/botlib/l_precomp.c|   2 +-
 code/client/cl_input.c |  24 +-
 code/client/cl_keys.c  |  27 ++
 code/client/cl_main.c  |   6 +-
 code/client/keycodes.h |  30 ++
 code/game/ai_dmnet.c   |   3 +-
 code/game/ai_main.c|   6 +-
 code/null/null_glimp.c |  15 +-
 code/qcommon/msg.c |  66 +---
 code/renderercommon/qgl.h  | 371 ++
 code/renderergl1/tr_world.c|  10 +-
 code/renderergl2/glsl/lightall_fp.glsl |  29 --
 code/renderergl2/glsl/lightall_vp.glsl |  22 +-
 code/renderergl2/tr_animation.c|   2 +-
 code/renderergl2/tr_backend.c  |  31 +-
 code/renderergl2/tr_bsp.c  | 308 ++-
 code/renderergl2/tr_curve.c|  72 ++--
 code/renderergl2/tr_dsa.c  |  84 ++--
 code/renderergl2/tr_dsa.h  |  44 +--
 code/renderergl2/tr_extensions.c   | 687 +
 code/renderergl2/tr_fbo.c  |  14 +-
 code/renderergl2/tr_glsl.c | 229 +--
 code/renderergl2/tr_image.c|  59 ++-
 code/renderergl2/tr_init.c |  14 +-
 code/renderergl2/tr_light.c|  38 +-
 code/renderergl2/tr_local.h|  65 ++--
 code/renderergl2/tr_main.c | 379 ++
 code/renderergl2/tr_marks.c|  23 +-
 code/renderergl2/tr_model.c| 101 +++--
 code/renderergl2/tr_model_iqm.c|  21 +-
 code/renderergl2/tr_postprocess.c  |   4 +-
 code/renderergl2/tr_scene.c|   6 -
 code/renderergl2/tr_shade.c|  88 ++---
 code/renderergl2/tr_shade_calc.c   |  24 +-
 code/renderergl2/tr_shader.c   |   8 +-
 code/renderergl2/tr_sky.c  |   2 +-
 code/renderergl2/tr_surface.c  | 425 +++-
 code/renderergl2/tr_vbo.c  | 245 
 code/renderergl2/tr_world.c|  22 +-
 code/sdl/sdl_input.c   | 251 +++-
 code/tools/asm/q3asm.c |   2 +-
 misc/linux/server_compile.sh   |   2 +-
 opengl2-readme.md  |  76 ++--
 49 files changed, 1380 insertions(+), 2607 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 41/59: Merge pull request #216 from tkoeppe/abs

[Simon McVittie]

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

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

commit bd062f713aa5267e95c38154736a15ea072008b5
Merge: bbc9e26 0eb72cd
Author: Tim Angus 
Date:   Tue Sep 13 10:34:48 2016 +0100

Merge pull request #216 from tkoeppe/abs

[renderergl2/tr_main.c] Use floating-point fabsf() for floating-point values

 code/renderergl2/tr_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 37/59: OpenGL2: Fix reversed VectorCopy4() usage.

[Simon McVittie]

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

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

commit ec3779988cadcc54bdbcfd4e64099b82c1f6b81a
Author: SmileTheory 
Date:   Sun Sep 11 16:08:18 2016 -0700

OpenGL2: Fix reversed VectorCopy4() usage.
---
 code/renderergl2/tr_surface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index c19410c..063f4b1 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -1125,14 +1125,14 @@ static void RB_SurfaceGrid( srfBspSurface_t *srf ) {
 
if ( tess.shader->vertexAttribs & ATTR_NORMAL )
{
-   VectorCopy4(normal, dv->normal);
+   VectorCopy4(dv->normal, normal);
normal += 4;
}
 
 #ifdef USE_VERT_TANGENT_SPACE
if ( tess.shader->vertexAttribs & ATTR_TANGENT )
{
-   VectorCopy4(tangent, dv->tangent);
+   VectorCopy4(dv->tangent, tangent);
tangent += 4;
}
 #endif

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 43/59: Merge pull request #221 from tkoeppe/strncpy

[Simon McVittie]

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

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

commit 4c169ab574d930d92b609394ca3ced0d0a6e6834
Merge: bd062f7 90f2f02
Author: Tim Angus 
Date:   Tue Sep 13 13:55:08 2016 +0100

Merge pull request #221 from tkoeppe/strncpy

[code/botlib/l_precomp.c] Fix string buffer overflow

 code/botlib/l_precomp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 44/59: OpenGL2: Remove map color scaling and r_forceSunMapLightScale.

[Simon McVittie]

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

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

commit 4faf1008a058e589ea97a182d5590ac737420ca2
Author: SmileTheory 
Date:   Wed Sep 14 02:59:54 2016 -0700

OpenGL2: Remove map color scaling and r_forceSunMapLightScale.

Also simplify overbright code in ComputeShaderColors().
---
 code/renderergl2/tr_backend.c |  3 --
 code/renderergl2/tr_bsp.c | 11 ---
 code/renderergl2/tr_image.c   |  4 ---
 code/renderergl2/tr_init.c|  2 --
 code/renderergl2/tr_local.h   |  4 ---
 code/renderergl2/tr_main.c| 10 +-
 code/renderergl2/tr_scene.c   |  6 
 code/renderergl2/tr_shade.c   | 72 +--
 code/renderergl2/tr_shader.c  |  6 ++--
 code/renderergl2/tr_sky.c |  2 +-
 opengl2-readme.md | 10 ++
 11 files changed, 31 insertions(+), 99 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index 82a353d..5c349de 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -712,9 +712,6 @@ voidRB_SetGL2D (void) {
// set time for 2D shaders
backEnd.refdef.time = ri.Milliseconds();
backEnd.refdef.floatTime = backEnd.refdef.time * 0.001f;
-
-   // reset color scaling
-   backEnd.refdef.colorScale = 1.0f;
 }
 
 
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 8b923c3..8f56de8 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -105,11 +105,7 @@ static void R_ColorShiftLightingBytes( byte in[4], 
byte out[4] ) {
int shift, r, g, b;
 
// shift the color data based on overbright range
-#if defined(USE_OVERBRIGHT)
shift = r_mapOverBrightBits->integer - tr.overbrightBits;
-#else
-   shift = 0;
-#endif
 
// shift the data based on overbright range
r = in[0] << shift;
@@ -144,9 +140,7 @@ static void R_ColorShiftLightingFloats(float in[4], float 
out[4], float scale )
 {
float   r, g, b;
 
-#if defined(USE_OVERBRIGHT)
scale *= 1 << (r_mapOverBrightBits->integer - tr.overbrightBits);
-#endif
 
r = in[0] * scale;
g = in[1] * scale;
@@ -2686,11 +2680,7 @@ void R_LoadLightGrid( lump_t *l ) {
 
if (hdrLightGrid)
{
-#if defined(USE_OVERBRIGHT)
float lightScale = 1 << (r_mapOverBrightBits->integer - 
tr.overbrightBits);
-#else
-   float lightScale = 1.0f;
-#endif
 
//ri.Printf(PRINT_ALL, "found!\n");
 
@@ -3165,7 +3155,6 @@ void RE_LoadWorldMap( const char *name ) {
}
 
// set default map light scale
-   tr.mapLightScale  = 1.0f;
tr.sunShadowScale = 0.5f;
 
// set default sun direction to be used if it isn't
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 95989b9..3e8099a 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -2845,11 +2845,7 @@ void R_SetColorMappings( void ) {
int inf;
 
// setup the overbright lighting
-#if defined(USE_OVERBRIGHT)
tr.overbrightBits = r_overBrightBits->integer;
-#else
-   tr.overbrightBits = 0;
-#endif
 
// allow 2 overbright bits
if ( tr.overbrightBits > 2 ) {
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 8809039..30803e2 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -155,7 +155,6 @@ cvar_t  *r_imageUpsampleMaxSize;
 cvar_t  *r_imageUpsampleType;
 cvar_t  *r_genNormalMaps;
 cvar_t  *r_forceSun;
-cvar_t  *r_forceSunMapLightScale;
 cvar_t  *r_forceSunLightScale;
 cvar_t  *r_forceSunAmbientScale;
 cvar_t  *r_sunlightMode;
@@ -1245,7 +1244,6 @@ void R_Register( void )
r_genNormalMaps = ri.Cvar_Get( "r_genNormalMaps", "0", CVAR_ARCHIVE | 
CVAR_LATCH );
 
r_forceSun = ri.Cvar_Get( "r_forceSun", "0", CVAR_CHEAT );
-   r_forceSunMapLightScale = ri.Cvar_Get( "r_forceSunMapLightScale", 
"1.0", CVAR_CHEAT );
r_forceSunLightScale = ri.Cvar_Get( "r_forceSunLightScale", "1.0", 
CVAR_CHEAT );
r_forceSunAmbientScale = ri.Cvar_Get( "r_forceSunAmbientScale", "0.5", 
CVAR_CHEAT );
r_drawSunRays = ri.Cvar_Get( "r_drawSunRays", "0", CVAR_ARCHIVE | 
CVAR_LATCH );
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index a2707cb..09e70d2 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -56,7 +56,6 @@ typedef unsigned int glIndex_t;
 #define PSHADOW_MAP_SIZE  512
 
 #define USE_VERT_TANGENT_SPACE
-#define USE_OVERBRIGHT
 
 typedef struct cubemap_s {
char name[MAX_QPATH];
@@ -761,7 +760,6 @@ typedef struct {
float   sunDir[4];
float   sunCol[4];
float   sunAmbCol[4];
-   float   colorScale;
 
float   autoExposureMinMax[2];
float   

[ioquake3] 39/59: Merge pull request #220 from tkoeppe/shift

[Simon McVittie]

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

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

commit 7d063ba81da8f269e7bf4beee8440a99dab14279
Merge: ec37799 fe111df
Author: Tim Angus 
Date:   Mon Sep 12 18:00:21 2016 +0100

Merge pull request #220 from tkoeppe/shift

[qcommon/msg.c] Remove dead code

 code/qcommon/msg.c | 66 +-
 1 file changed, 20 insertions(+), 46 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 35/59: OpenGL2: Make R_FreeSurfaceGridMeshData() static.

[Simon McVittie]

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

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

commit 927c9cc23c52cc7b953a0ed8bf397d2a77eab4ec
Author: SmileTheory 
Date:   Wed Sep 7 14:59:19 2016 -0700

OpenGL2: Make R_FreeSurfaceGridMeshData() static.
---
 code/renderergl2/tr_curve.c | 2 +-
 code/renderergl2/tr_local.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_curve.c b/code/renderergl2/tr_curve.c
index c693ae8..2f56b4b 100644
--- a/code/renderergl2/tr_curve.c
+++ b/code/renderergl2/tr_curve.c
@@ -432,7 +432,7 @@ void R_CreateSurfaceGridMesh(srfBspSurface_t *grid, int 
width, int height,
 R_FreeSurfaceGridMesh
 =
 */
-void R_FreeSurfaceGridMeshData( srfBspSurface_t *grid ) {
+static void R_FreeSurfaceGridMeshData( srfBspSurface_t *grid ) {
ri.Free(grid->widthLodError);
ri.Free(grid->heightLodError);
ri.Free(grid->indexes);
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 998d981..a2707cb 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -2153,7 +2153,6 @@ void R_SubdividePatchToGrid( srfBspSurface_t *grid, int 
width, int height,
srfVert_t 
points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
 void R_GridInsertColumn( srfBspSurface_t *grid, int column, int row, vec3_t 
point, float loderror );
 void R_GridInsertRow( srfBspSurface_t *grid, int row, int column, vec3_t 
point, float loderror );
-void R_FreeSurfaceGridMesh( srfBspSurface_t *grid );
 
 /*
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 42/59: [code/botlib/l_precomp.c] Fix string buffer overflow

[Simon McVittie]

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

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

commit 90f2f02c55af937f83cacfdcd4188ea6359ddaa0
Author: Thomas Köppe 
Date:   Tue Sep 13 13:36:15 2016 +0100

[code/botlib/l_precomp.c] Fix string buffer overflow
---
 code/botlib/l_precomp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
index c0870db..4414f4c 100644
--- a/code/botlib/l_precomp.c
+++ b/code/botlib/l_precomp.c
@@ -1323,7 +1323,7 @@ define_t *PC_DefineFromString(char *string)
script = LoadScriptMemory(string, strlen(string), "*extern");
//create a new source
Com_Memset(, 0, sizeof(source_t));
-   strncpy(src.filename, "*extern", MAX_PATH);
+   strncpy(src.filename, "*extern", sizeof(src.filename) - 1);
src.scriptstack = script;
 #if DEFINEHASHING
src.definehash = GetClearedMemory(DEFINEHASHSIZE * sizeof(define_t *));

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 40/59: OpenGL2: Fix more reversed VectorCopy4() usage.

[Simon McVittie]

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

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

commit bbc9e263f0d5ca5d7c0e0ae2e7a6d4564be7a26a
Author: SmileTheory 
Date:   Tue Sep 13 01:41:46 2016 -0700

OpenGL2: Fix more reversed VectorCopy4() usage.
---
 code/renderergl2/tr_surface.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index 063f4b1..082254b 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -128,10 +128,10 @@ void RB_AddQuadStampExt( vec3_t origin, vec3_t left, 
vec3_t up, float color[4],
 
R_VaoPackNormal(iNormal, normal);
 
-   VectorCopy4(tess.normal[ndx], iNormal);
-   VectorCopy4(tess.normal[ndx+1], iNormal);
-   VectorCopy4(tess.normal[ndx+2], iNormal);
-   VectorCopy4(tess.normal[ndx+3], iNormal);
+   VectorCopy4(iNormal, tess.normal[ndx]);
+   VectorCopy4(iNormal, tess.normal[ndx + 1]);
+   VectorCopy4(iNormal, tess.normal[ndx + 2]);
+   VectorCopy4(iNormal, tess.normal[ndx + 3]);
 
// standard square texture coordinates
VectorSet2(tess.texCoords[ndx  ][0], s1, t1);
@@ -1156,7 +1156,7 @@ static void RB_SurfaceGrid( srfBspSurface_t *srf ) {
 
if ( tess.shader->vertexAttribs & 
ATTR_LIGHTDIRECTION )
{
-   VectorCopy4(lightdir, dv->lightdir);
+   VectorCopy4(dv->lightdir, lightdir);
lightdir += 4;
}
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 38/59: [qcommon/msg.c] Remove dead code (which had undefined behaviour)

[Simon McVittie]

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

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

commit fe111df610236923d7ad23b36209f5f9962fa0e3
Author: Thomas Köppe 
Date:   Mon Sep 12 12:41:37 2016 +0100

[qcommon/msg.c] Remove dead code (which had undefined behaviour)
---
 code/qcommon/msg.c | 66 +-
 1 file changed, 20 insertions(+), 46 deletions(-)

diff --git a/code/qcommon/msg.c b/code/qcommon/msg.c
index 397c603..20dec91 100644
--- a/code/qcommon/msg.c
+++ b/code/qcommon/msg.c
@@ -101,12 +101,9 @@ bit functions
 =
 */
 
-intoverflows;
-
 // negative bit values include signs
 void MSG_WriteBits( msg_t *msg, int value, int bits ) {
int i;
-// FILE*   fp;
 
oldsize += bits;
 
@@ -120,69 +117,46 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
Com_Error( ERR_DROP, "MSG_WriteBits: bad bits %i", bits );
}
 
-   // check for overflows
-   if ( bits != 32 ) {
-   if ( bits > 0 ) {
-   if ( value > ( ( 1 << bits ) - 1 ) || value < 0 ) {
-   overflows++;
-   }
-   } else {
-   int r;
-
-   r = 1 << (bits-1);
-
-   if ( value >  r - 1 || value < -r ) {
-   overflows++;
-   }
-   }
-   }
if ( bits < 0 ) {
bits = -bits;
}
-   if (msg->oob) {
-   if(bits==8)
-   {
+
+   if ( msg->oob ) {
+   if ( bits == 8 ) {
msg->data[msg->cursize] = value;
msg->cursize += 1;
msg->bit += 8;
-   }
-   else if(bits==16)
-   {
+   } else if ( bits == 16 ) {
short temp = value;
-   
-   CopyLittleShort(>data[msg->cursize], );
+
+   CopyLittleShort( >data[msg->cursize],  );
msg->cursize += 2;
msg->bit += 16;
-   }
-   else if(bits==32)
-   {
-   CopyLittleLong(>data[msg->cursize], );
+   } else if ( bits==32 ) {
+   CopyLittleLong( >data[msg->cursize],  );
msg->cursize += 4;
msg->bit += 32;
+   } else {
+   Com_Error( ERR_DROP, "can't write %d bits", bits );
}
-   else 
-   Com_Error(ERR_DROP, "can't write %d bits", bits);
} else {
-// fp = fopen("c:\\netchan.bin", "a");
-   value &= (0x>>(32-bits));
-   if (bits&7) {
+   value &= (0x >> (32 - bits));
+   if ( bits&7 ) {
int nbits;
nbits = bits&7;
-   for(i=0;idata, >bit);
-   value = (value>>1);
+   for( i = 0; i < nbits; i++ ) {
+   Huff_putBit( (value & 1), msg->data, >bit 
);
+   value = (value >> 1);
}
bits = bits - nbits;
}
-   if (bits) {
-   for(i=0;idata, >bit);
-   value = (value>>8);
+   if ( bits ) {
+   for( i = 0; i < bits; i += 8 ) {
+   Huff_offsetTransmit( , 
(value & 0xff), msg->data, >bit );
+   value = (value >> 8);
}
}
-   msg->cursize = (msg->bit>>3)+1;
-// fclose(fp);
+   msg->cursize = (msg->bit >> 3) + 1;
}
 }
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 36/59: Fix undefined behavior when shifting left by 32.

[Simon McVittie]

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

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

commit 497a74f22a39cbf8694e5d8567f3113f03ba3620
Author: SmileTheory 
Date:   Wed Sep 7 16:56:23 2016 -0700

Fix undefined behavior when shifting left by 32.

https://bugzilla.icculus.org/show_bug.cgi?id=6432
---
 code/renderergl1/tr_world.c | 10 +-
 code/renderergl2/tr_world.c | 22 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/renderergl1/tr_world.c b/code/renderergl1/tr_world.c
index 0a2743f..88eca6d 100644
--- a/code/renderergl1/tr_world.c
+++ b/code/renderergl1/tr_world.c
@@ -353,10 +353,10 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 R_RecursiveWorldNode
 
 */
-static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits 
) {
+static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, 
unsigned int dlightBits ) {
 
do {
-   int newDlights[2];
+   unsigned int newDlights[2];
 
// if the node wasn't marked as potentially visible, exit
if (node->visframe != tr.visCount) {
@@ -661,8 +661,8 @@ void R_AddWorldSurfaces (void) {
ClearBounds( tr.viewParms.visBounds[0], tr.viewParms.visBounds[1] );
 
// perform frustum culling and add all the potentially visible surfaces
-   if ( tr.refdef.num_dlights > 32 ) {
-   tr.refdef.num_dlights = 32 ;
+   if ( tr.refdef.num_dlights > MAX_DLIGHTS ) {
+   tr.refdef.num_dlights = MAX_DLIGHTS ;
}
-   R_RecursiveWorldNode( tr.world->nodes, 15, ( 1 << tr.refdef.num_dlights 
) - 1 );
+   R_RecursiveWorldNode( tr.world->nodes, 15, ( 1ULL << 
tr.refdef.num_dlights ) - 1 );
 }
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 98b1c81..c4b1533 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -401,11 +401,11 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 R_RecursiveWorldNode
 
 */
-static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int 
dlightBits, int pshadowBits ) {
+static void R_RecursiveWorldNode( mnode_t *node, uint32_t planeBits, uint32_t 
dlightBits, uint32_t pshadowBits ) {
 
do {
-   int newDlights[2];
-   unsigned int newPShadows[2];
+   uint32_t newDlights[2];
+   uint32_t newPShadows[2];
 
// if the node wasn't marked as potentially visible, exit
// pvs is skipped for depth shadows
@@ -761,7 +761,7 @@ R_AddWorldSurfaces
 =
 */
 void R_AddWorldSurfaces (void) {
-   int planeBits, dlightBits, pshadowBits;
+   uint32_t planeBits, dlightBits, pshadowBits;
 
if ( !r_drawworld->integer ) {
return;
@@ -782,12 +782,12 @@ void R_AddWorldSurfaces (void) {
ClearBounds( tr.viewParms.visBounds[0], tr.viewParms.visBounds[1] );
 
// perform frustum culling and flag all the potentially visible surfaces
-   if ( tr.refdef.num_dlights > 32 ) {
-   tr.refdef.num_dlights = 32 ;
+   if ( tr.refdef.num_dlights > MAX_DLIGHTS ) {
+   tr.refdef.num_dlights = MAX_DLIGHTS ;
}
 
-   if ( tr.refdef.num_pshadows > 32 ) {
-   tr.refdef.num_pshadows = 32 ;
+   if ( tr.refdef.num_pshadows > MAX_DRAWN_PSHADOWS ) {
+   tr.refdef.num_pshadows = MAX_DRAWN_PSHADOWS;
}
 
planeBits = (tr.viewParms.flags & VPF_FARPLANEFRUSTUM) ? 31 : 15;
@@ -799,12 +799,12 @@ void R_AddWorldSurfaces (void) {
}
else if ( !(tr.viewParms.flags & VPF_SHADOWMAP) )
{
-   dlightBits = ( 1 << tr.refdef.num_dlights ) - 1;
-   pshadowBits = ( 1 << tr.refdef.num_pshadows ) - 1;
+   dlightBits = ( 1ULL << tr.refdef.num_dlights ) - 1;
+   pshadowBits = ( 1ULL << tr.refdef.num_pshadows ) - 1;
}
else
{
-   dlightBits = ( 1 << tr.refdef.num_dlights ) - 1;
+   dlightBits = ( 1ULL << tr.refdef.num_dlights ) - 1;
pshadowBits = 0;
}
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 33/59: OpenGL2: Store normals/tangents as int16_t[4].

[Simon McVittie]

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

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

commit dfbaf5032437426f40599b2a617453511f6d550a
Author: SmileTheory 
Date:   Tue Sep 6 00:57:15 2016 -0700

OpenGL2: Store normals/tangents as int16_t[4].
---
 code/renderergl2/tr_animation.c  |   2 +-
 code/renderergl2/tr_bsp.c| 205 +++-
 code/renderergl2/tr_curve.c  |   6 +-
 code/renderergl2/tr_extensions.c |  17 --
 code/renderergl2/tr_init.c   |   2 -
 code/renderergl2/tr_local.h  |  33 ++--
 code/renderergl2/tr_main.c   | 363 +++
 code/renderergl2/tr_marks.c  |  23 ++-
 code/renderergl2/tr_model.c  |  89 +
 code/renderergl2/tr_model_iqm.c  |  15 +-
 code/renderergl2/tr_shade_calc.c |  24 +--
 code/renderergl2/tr_surface.c| 398 +--
 code/renderergl2/tr_vbo.c| 147 ---
 13 files changed, 285 insertions(+), 1039 deletions(-)

diff --git a/code/renderergl2/tr_animation.c b/code/renderergl2/tr_animation.c
index 53e5ee9..4f333cb 100644
--- a/code/renderergl2/tr_animation.c
+++ b/code/renderergl2/tr_animation.c
@@ -412,7 +412,7 @@ void RB_MDRSurfaceAnim( mdrSurface_t *surface )
tess.xyz[baseVertex + j][1] = tempVert[1];
tess.xyz[baseVertex + j][2] = tempVert[2];
 
-   R_VaoPackNormal((byte *)[baseVertex + j], 
tempNormal);
+   R_VaoPackNormal(tess.normal[baseVertex + j], tempNormal);
 
tess.texCoords[baseVertex + j][0][0] = v->texCoords[0];
tess.texCoords[baseVertex + j][0][1] = v->texCoords[1];
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 6abfd25..dbd3932 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -667,6 +667,63 @@ static shader_t *ShaderForShaderNum( int shaderNum, int 
lightmapNum ) {
return shader;
 }
 
+void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int realLightmapNum, 
float hdrVertColors[3])
+{
+   vec4_t v;
+
+   s->xyz[0] = LittleFloat(d->xyz[0]);
+   s->xyz[1] = LittleFloat(d->xyz[1]);
+   s->xyz[2] = LittleFloat(d->xyz[2]);
+
+   s->st[0] = LittleFloat(d->st[0]);
+   s->st[1] = LittleFloat(d->st[1]);
+
+   if (realLightmapNum >= 0)
+   {
+   s->lightmap[0] = FatPackU(LittleFloat(d->lightmap[0]), 
realLightmapNum);
+   s->lightmap[1] = FatPackV(LittleFloat(d->lightmap[1]), 
realLightmapNum);
+   }
+   else
+   {
+   s->lightmap[0] = LittleFloat(d->lightmap[0]);
+   s->lightmap[1] = LittleFloat(d->lightmap[1]);
+   }
+
+   v[0] = LittleFloat(d->normal[0]);
+   v[1] = LittleFloat(d->normal[1]);
+   v[2] = LittleFloat(d->normal[2]);
+
+   R_VaoPackNormal(s->normal, v);
+
+   if (hdrVertColors)
+   {
+   v[0] = hdrVertColors[0];
+   v[1] = hdrVertColors[1];
+   v[2] = hdrVertColors[2];
+   }
+   else
+   {
+   //hack: convert LDR vertex colors to HDR
+   if (r_hdr->integer)
+   {
+   v[0] = MAX(d->color[0], 0.499f);
+   v[1] = MAX(d->color[1], 0.499f);
+   v[2] = MAX(d->color[2], 0.499f);
+   }
+   else
+   {
+   v[0] = d->color[0];
+   v[1] = d->color[1];
+   v[2] = d->color[2];
+   }
+
+   }
+   v[3] = d->color[3] / 255.0f;
+
+   R_ColorShiftLightingFloats(v, s->vertexColors, 1.0f / 255.0f);
+}
+
+
 /*
 ===
 ParseFace
@@ -714,50 +771,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, 
float *hdrVertColors,
ClearBounds(surf->cullinfo.bounds[0], surf->cullinfo.bounds[1]);
verts += LittleLong(ds->firstVert);
for(i = 0; i < numVerts; i++)
-   {
-   vec4_t color;
-
-   for(j = 0; j < 3; j++)
-   {
-   cv->verts[i].xyz[j] = LittleFloat(verts[i].xyz[j]);
-   cv->verts[i].normal[j] = 
LittleFloat(verts[i].normal[j]);
-   }
-   AddPointToBounds(cv->verts[i].xyz, surf->cullinfo.bounds[0], 
surf->cullinfo.bounds[1]);
-   for(j = 0; j < 2; j++)
-   {
-   cv->verts[i].st[j] = LittleFloat(verts[i].st[j]);
-   //cv->verts[i].lightmap[j] = 
LittleFloat(verts[i].lightmap[j]);
-   }
-   cv->verts[i].lightmap[0] = 
FatPackU(LittleFloat(verts[i].lightmap[0]), realLightmapNum);
-   cv->verts[i].lightmap[1] = 
FatPackV(LittleFloat(verts[i].lightmap[1]), realLightmapNum);
-
-   if (hdrVertColors)
-   {
-   color[0] = hdrVertColors[(ds->firstVert + i) * 3];
-   

[ioquake3] 34/59: OpenGL2: Fix missing bounds calculation when loading BSP surfaces.

[Simon McVittie]

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

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

commit f9e571231100fa24ebc14432f0635324b86d7417
Author: SmileTheory 
Date:   Tue Sep 6 19:44:14 2016 -0700

OpenGL2: Fix missing bounds calculation when loading BSP surfaces.
---
 code/renderergl2/tr_bsp.c | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index dbd3932..8b923c3 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -667,7 +667,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int 
lightmapNum ) {
return shader;
 }
 
-void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int realLightmapNum, 
float hdrVertColors[3])
+void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int realLightmapNum, 
float hdrVertColors[3], vec3_t *bounds)
 {
vec4_t v;
 
@@ -675,6 +675,9 @@ void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int 
realLightmapNum, flo
s->xyz[1] = LittleFloat(d->xyz[1]);
s->xyz[2] = LittleFloat(d->xyz[2]);
 
+   if (bounds)
+   AddPointToBounds(s->xyz, bounds[0], bounds[1]);
+
s->st[0] = LittleFloat(d->st[0]);
s->st[1] = LittleFloat(d->st[1]);
 
@@ -771,7 +774,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, 
float *hdrVertColors,
ClearBounds(surf->cullinfo.bounds[0], surf->cullinfo.bounds[1]);
verts += LittleLong(ds->firstVert);
for(i = 0; i < numVerts; i++)
-   LoadDrawVertToSrfVert(>verts[i], [i], 
realLightmapNum, hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : 
NULL);
+   LoadDrawVertToSrfVert(>verts[i], [i], 
realLightmapNum, hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : 
NULL, surf->cullinfo.bounds);
 
// copy triangles
badTriangles = 0;
@@ -872,7 +875,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, 
float *hdrVertColors,
verts += LittleLong( ds->firstVert );
numPoints = width * height;
for(i = 0; i < numPoints; i++)
-   LoadDrawVertToSrfVert([i], [i], realLightmapNum, 
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL);
+   LoadDrawVertToSrfVert([i], [i], realLightmapNum, 
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL, NULL);
 
// pre-tesseleate
R_SubdividePatchToGrid( grid, width, height, points );
@@ -936,7 +939,7 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t 
*verts, float *hdrVertColor
ClearBounds(surf->cullinfo.bounds[0], surf->cullinfo.bounds[1]);
verts += LittleLong(ds->firstVert);
for(i = 0; i < numVerts; i++)
-   LoadDrawVertToSrfVert(>verts[i], [i], -1, 
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL);
+   LoadDrawVertToSrfVert(>verts[i], [i], -1, 
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL, 
surf->cullinfo.bounds);
 
// copy triangles
badTriangles = 0;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 32/59: [renderergl2/tr_main.c] Use floating-point fabsf() for floating-point values

[Simon McVittie]

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

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

commit 0eb72cd8c40bbe4d1b0aeae0ea8b3f1af834ef6f
Author: Thomas Köppe 
Date:   Thu Sep 1 17:29:32 2016 +0100

[renderergl2/tr_main.c] Use floating-point fabsf() for floating-point values
---
 code/renderergl2/tr_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 24d17e0..de2d6d4 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -2362,7 +2362,7 @@ void R_RenderPshadowMaps(const refdef_t *fd)
VectorScale(lightDir, -1.0f, shadow->lightViewAxis[0]);
VectorSet(up, 0, 0, -1);
 
-   if ( abs(DotProduct(up, shadow->lightViewAxis[0])) > 0.9f )
+   if ( fabsf(DotProduct(up, shadow->lightViewAxis[0])) > 0.9f )
{
VectorSet(up, -1, 0, 0);
}
@@ -2605,7 +2605,7 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
}
 
// Check if too close to parallel to light direction
-   if (abs(DotProduct(lightViewAxis[2], lightViewAxis[0])) > 0.9f)
+   if (fabsf(DotProduct(lightViewAxis[2], lightViewAxis[0])) > 0.9f)
{
if (level == 3 || lightViewIndependentOfCameraView)
{

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 28/59: Merge pull request #212 from MAN-AT-ARMS/sdl204-stripped

[Simon McVittie]

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

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

commit fb65e1232fe8eb3468df20d9ab465be3073285de
Merge: e8c5b3a 966d39e
Author: James Canete 
Date:   Tue Aug 16 18:57:30 2016 -0700

Merge pull request #212 from MAN-AT-ARMS/sdl204-stripped

Add stripped SDL2 reference dll's to repo

 code/libs/win32/SDL2.dll   | Bin 4797982 -> 950272 bytes
 code/libs/win64/SDL264.dll | Bin 6573422 -> 1117696 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 30/59: [game/ai_main.c] Use floating-point fabs() for floating-point values

[Simon McVittie]

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

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

commit 3c8da8ca0768fb46265f59982e8c484f4dba3b1d
Author: Thomas Köppe 
Date:   Tue Aug 23 19:30:02 2016 +0100

[game/ai_main.c] Use floating-point fabs() for floating-point values
---
 code/game/ai_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/ai_main.c b/code/game/ai_main.c
index 2dacd87..c695831 100644
--- a/code/game/ai_main.c
+++ b/code/game/ai_main.c
@@ -781,7 +781,7 @@ void BotChangeViewAngles(bot_state_t *bs, float thinktime) {
//
if (bot_challenge.integer) {
//smooth slowdown view model
-   diff = abs(AngleDifference(bs->viewangles[i], 
bs->ideal_viewangles[i]));
+   diff = fabs(AngleDifference(bs->viewangles[i], 
bs->ideal_viewangles[i]));
anglespeed = diff * factor;
if (anglespeed > maxchange) anglespeed = maxchange;
bs->viewangles[i] = 
BotChangeViewAngle(bs->viewangles[i],
@@ -878,7 +878,7 @@ void BotInputToUserCommand(bot_input_t *bi, usercmd_t 
*ucmd, int delta_angles[3]
//set the view independent movement
f = DotProduct(forward, bi->dir);
r = DotProduct(right, bi->dir);
-   u = abs(forward[2]) * bi->dir[2];
+   u = fabs(forward[2]) * bi->dir[2];
m = fabs(f);
 
if (fabs(r) > m) {

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 29/59: Fix joystick w/o controller mapping not working with SDL update.

[Simon McVittie]

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

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

commit c5c01e771a2eb01d5c6bc994fff272bf2469fb26
Author: SmileTheory 
Date:   Tue Aug 16 19:01:18 2016 -0700

Fix joystick w/o controller mapping not working with SDL update.
---
 code/sdl/sdl_input.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index d0ebebc..4c8ff1f 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -439,6 +439,21 @@ static void IN_InitJoystick( void )
gamepad = NULL;
memset(_state, '\0', sizeof (stick_state));
 
+   // SDL 2.0.4 requires SDL_INIT_JOYSTICK to be initialized separately 
from
+   // SDL_INIT_GAMECONTROLLER for SDL_JoystickOpen() to work correctly,
+   // despite https://wiki.libsdl.org/SDL_Init (retrieved 2016-08-16)
+   // indicating SDL_INIT_JOYSTICK should be initialized automatically.
+   if (!SDL_WasInit(SDL_INIT_JOYSTICK))
+   {
+   Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
+   if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
+   {
+   Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", 
SDL_GetError());
+   return;
+   }
+   Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) passed.\n");
+   }
+
if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER))
{
Com_DPrintf("Calling SDL_Init(SDL_INIT_GAMECONTROLLER)...\n");
@@ -477,7 +492,7 @@ static void IN_InitJoystick( void )
stick = SDL_JoystickOpen( in_joystickNo->integer );
 
if (stick == NULL) {
-   Com_DPrintf( "No joystick opened.\n" );
+   Com_DPrintf( "No joystick opened: %s\n", SDL_GetError() );
return;
}
 
@@ -507,6 +522,9 @@ static void IN_ShutdownJoystick( void )
if ( !SDL_WasInit( SDL_INIT_GAMECONTROLLER ) )
return;
 
+   if ( !SDL_WasInit( SDL_INIT_JOYSTICK ) )
+   return;
+
if (gamepad)
{
SDL_GameControllerClose(gamepad);
@@ -520,6 +538,7 @@ static void IN_ShutdownJoystick( void )
}
 
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+   SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 }
 
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 31/59: Merge pull request #213 from tkoeppe/abs

[Simon McVittie]

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

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

commit 762f50757d42f2297ef94fcf483855b88aa8e133
Merge: c5c01e7 3c8da8c
Author: Tim Angus 
Date:   Tue Aug 23 21:19:36 2016 +0100

Merge pull request #213 from tkoeppe/abs

[game/ai_main.c] Use floating-point fabs() for floating-point values

 code/game/ai_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 27/59: Add stripped SDL2 reference dll's to repo

[Simon McVittie]

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

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

commit 966d39efed36744d9301cafb316eb24958aeec01
Author: MAN-AT-ARMS 
Date:   Tue Aug 16 10:50:24 2016 -0400

Add stripped SDL2 reference dll's to repo
---
 code/libs/win32/SDL2.dll   | Bin 4797982 -> 950272 bytes
 code/libs/win64/SDL264.dll | Bin 6573422 -> 1117696 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/code/libs/win32/SDL2.dll b/code/libs/win32/SDL2.dll
index 10cca80..e499174 100755
Binary files a/code/libs/win32/SDL2.dll and b/code/libs/win32/SDL2.dll differ
diff --git a/code/libs/win64/SDL264.dll b/code/libs/win64/SDL264.dll
index 61c5bac..b469787 100755
Binary files a/code/libs/win64/SDL264.dll and b/code/libs/win64/SDL264.dll 
differ

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 26/59: Merge pull request #207 from MAN-AT-ARMS/sdl204

[Simon McVittie]

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

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

commit e8c5b3a5350eb255787d5067bb8bae6f7566645b
Merge: 4ce600f 4f9310d
Author: James Canete 
Date:   Tue Aug 16 01:18:05 2016 -0700

Merge pull request #207 from MAN-AT-ARMS/sdl204

Update SDL2 to 2.0.4

 code/SDL2/include/SDL.h|47 +-
 code/SDL2/include/SDL_assert.h |45 +-
 code/SDL2/include/SDL_atomic.h |12 +-
 code/SDL2/include/SDL_audio.h  |   109 +-
 code/SDL2/include/SDL_bits.h   | 2 +-
 code/SDL2/include/SDL_blendmode.h  | 4 +-
 code/SDL2/include/SDL_clipboard.h  | 2 +-
 code/SDL2/include/SDL_config.h | 2 +-
 code/SDL2/include/SDL_config.h.cmake   |46 +-
 code/SDL2/include/SDL_config.h.in  |32 +-
 code/SDL2/include/SDL_config_android.h |13 +-
 code/SDL2/include/SDL_config_iphoneos.h|19 +-
 code/SDL2/include/SDL_config_macosx.h  | 6 +-
 code/SDL2/include/SDL_config_minimal.h | 2 +-
 code/SDL2/include/SDL_config_pandora.h | 5 +-
 code/SDL2/include/SDL_config_psp.h | 5 +-
 code/SDL2/include/SDL_config_windows.h |13 +-
 code/SDL2/include/SDL_config_winrt.h   |42 +-
 code/SDL2/include/SDL_config_wiz.h | 6 +-
 code/SDL2/include/SDL_copying.h| 2 +-
 code/SDL2/include/SDL_cpuinfo.h| 7 +-
 code/SDL2/include/SDL_egl.h|  1801 +-
 code/SDL2/include/SDL_endian.h | 6 +-
 code/SDL2/include/SDL_error.h  | 4 +-
 code/SDL2/include/SDL_events.h |43 +-
 code/SDL2/include/SDL_filesystem.h | 4 +-
 code/SDL2/include/SDL_gamecontroller.h |17 +-
 code/SDL2/include/SDL_gesture.h| 2 +-
 code/SDL2/include/SDL_haptic.h |34 +-
 code/SDL2/include/SDL_hints.h  |   232 +-
 code/SDL2/include/SDL_joystick.h   |30 +-
 code/SDL2/include/SDL_keyboard.h   | 2 +-
 code/SDL2/include/SDL_keycode.h| 2 +-
 code/SDL2/include/SDL_loadso.h | 2 +-
 code/SDL2/include/SDL_log.h|18 +-
 code/SDL2/include/SDL_main.h   |20 +-
 code/SDL2/include/SDL_messagebox.h | 2 +-
 code/SDL2/include/SDL_mouse.h  |78 +-
 code/SDL2/include/SDL_mutex.h  | 2 +-
 code/SDL2/include/SDL_name.h   | 2 +-
 code/SDL2/include/SDL_opengl.h | 12526 ++-
 .../include/{SDL_opengl.h => SDL_opengl_glext.h}   | 20617 ++-
 code/SDL2/include/SDL_opengles.h   | 2 +-
 code/SDL2/include/SDL_opengles2.h  |  2756 +--
 code/SDL2/include/SDL_opengles2_gl2.h  |   621 +
 .../{SDL_opengles2.h => SDL_opengles2_gl2ext.h}|  1526 +-
 code/SDL2/include/SDL_opengles2_gl2platform.h  |30 +
 code/SDL2/include/SDL_opengles2_khrplatform.h  |   282 +
 code/SDL2/include/SDL_pixels.h |33 +-
 code/SDL2/include/SDL_platform.h   |27 +-
 code/SDL2/include/SDL_power.h  | 2 +-
 code/SDL2/include/SDL_quit.h   | 2 +-
 code/SDL2/include/SDL_rect.h   |12 +-
 code/SDL2/include/SDL_render.h |26 +-
 code/SDL2/include/SDL_revision.h   | 4 +-
 code/SDL2/include/SDL_rwops.h  | 5 +-
 code/SDL2/include/SDL_scancode.h   | 2 +-
 code/SDL2/include/SDL_shape.h  | 2 +-
 code/SDL2/include/SDL_stdinc.h |   156 +-
 code/SDL2/include/SDL_surface.h| 2 +-
 code/SDL2/include/SDL_system.h |55 +-
 code/SDL2/include/SDL_syswm.h  |47 +-
 code/SDL2/include/SDL_test.h   | 4 +-
 code/SDL2/include/SDL_test_assert.h|10 +-
 code/SDL2/include/SDL_test_common.h| 2 +-
 code/SDL2/include/SDL_test_compare.h   | 6 +-
 code/SDL2/include/SDL_test_crc32.h |26 +-
 code/SDL2/include/SDL_test_font.h  | 2 +-
 code/SDL2/include/SDL_test_fuzzer.h| 6 +-
 code/SDL2/include/SDL_test_harness.h   | 2 +-
 code/SDL2/include/SDL_test_images.h| 2 +-
 code/SDL2/include/SDL_test_log.h   | 6 +-
 code/SDL2/include/SDL_test_md5.h   |20 

[ioquake3] 24/59: Missing bit of previous commit.

[Simon McVittie]

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

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

commit 4ce600f5ac048b85e4d3dd94db6687de06e15469
Author: SmileTheory 
Date:   Sun Aug 14 22:22:20 2016 -0700

Missing bit of previous commit.
---
 code/renderergl2/tr_bsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 47333b2..6abfd25 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -1083,7 +1083,7 @@ static void ParseFlare( dsurface_t *ds, drawVert_t 
*verts, msurface_t *surf, int
flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
}
 
-   surf->cullinfo = CULLINFO_NONE;
+   surf->cullinfo.type = CULLINFO_NONE;
 }
 
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 23/59: OpenGL2: Preallocate grid surfaces like other BSP surfaces.

[Simon McVittie]

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

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

commit fe8ac838e22af82f664bb49e35e96cb786029bf1
Author: SmileTheory 
Date:   Sun Aug 14 22:22:20 2016 -0700

OpenGL2: Preallocate grid surfaces like other BSP surfaces.
---
 code/renderergl2/tr_bsp.c   | 81 +
 code/renderergl2/tr_curve.c | 66 ++--
 code/renderergl2/tr_local.h |  6 ++--
 3 files changed, 65 insertions(+), 88 deletions(-)

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 2feeddb..47333b2 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -822,7 +822,7 @@ ParseMesh
 ===
 */
 static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float 
*hdrVertColors, msurface_t *surf ) {
-   srfBspSurface_t *grid;
+   srfBspSurface_t *grid = (srfBspSurface_t *)surf->data;
int i, j;
int width, height, numPoints;
srfVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
@@ -903,8 +903,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, 
float *hdrVertColors,
}
 
// pre-tesseleate
-   grid = R_SubdividePatchToGrid( width, height, points );
-   surf->data = (surfaceType_t *)grid;
+   R_SubdividePatchToGrid( grid, width, height, points );
 
// copy the level of detail origin, which is the center
// of the group of all curves that must subdivide the same
@@ -917,6 +916,12 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, 
float *hdrVertColors,
VectorScale( bounds[1], 0.5f, grid->lodOrigin );
VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
grid->lodRadius = VectorLength( tmpVec );
+
+   surf->cullinfo.type = CULLINFO_BOX | CULLINFO_SPHERE;
+   VectorCopy(grid->cullBounds[0], surf->cullinfo.bounds[0]);
+   VectorCopy(grid->cullBounds[1], surf->cullinfo.bounds[1]);
+   VectorCopy(grid->cullOrigin, surf->cullinfo.localOrigin);
+   surf->cullinfo.radius = grid->cullRadius;
 }
 
 /*
@@ -1077,6 +1082,8 @@ static void ParseFlare( dsurface_t *ds, drawVert_t 
*verts, msurface_t *surf, int
flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
}
+
+   surf->cullinfo = CULLINFO_NONE;
 }
 
 
@@ -1321,7 +1328,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
// insert column into grid2 right after 
after column l
if (m) row = grid2->height-1;
else row = 0;
-   grid2 = R_GridInsertColumn( grid2, l+1, 
row,
+   R_GridInsertColumn( grid2, l+1, row,

grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
grid2->lodStitched = qfalse;
s_worldData.surfaces[grid2num].data = 
(void *) grid2;
@@ -1365,7 +1372,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
// insert row into grid2 right after 
after row l
if (m) column = grid2->width-1;
else column = 0;
-   grid2 = R_GridInsertRow( grid2, l+1, 
column,
+   R_GridInsertRow( grid2, l+1, column,

grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
grid2->lodStitched = qfalse;
s_worldData.surfaces[grid2num].data = 
(void *) grid2;
@@ -1418,7 +1425,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
// insert column into grid2 right after 
after column l
if (m) row = grid2->height-1;
else row = 0;
-   grid2 = R_GridInsertColumn( grid2, l+1, 
row,
+   R_GridInsertColumn( grid2, l+1, row,

grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
grid2->lodStitched = qfalse;
s_worldData.surfaces[grid2num].data = 
(void *) grid2;
@@ -1462,7 +1469,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
// insert row into grid2 right after 
after row l
  

[ioquake3] 22/59: Fix black screen when in_joystick disabled but controller connected.

[Simon McVittie]

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

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

commit 1cf0b21cda562bade9152958f1525e5ac281ab9c
Author: SmileTheory 
Date:   Thu Aug 11 00:46:43 2016 -0700

Fix black screen when in_joystick disabled but controller connected.
---
 code/sdl/sdl_input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 802af4d..d0ebebc 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -1062,7 +1062,8 @@ static void IN_ProcessEvents( void )
 
case SDL_CONTROLLERDEVICEADDED:
case SDL_CONTROLLERDEVICEREMOVED:
-   IN_InitJoystick();
+   if (in_joystick->integer)
+   IN_InitJoystick();
break;
 
case SDL_QUIT:

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 21/59: Minor URL change.

[Simon McVittie]

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

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

commit f47aaa2a61c7f8100eee77e83ee17fb3bc3003af
Author: Zachary J. Slater 
Date:   Sun Aug 7 23:53:38 2016 -1000

Minor URL change.
---
 misc/linux/server_compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/linux/server_compile.sh b/misc/linux/server_compile.sh
index ed78be9..66bdc65 100644
--- a/misc/linux/server_compile.sh
+++ b/misc/linux/server_compile.sh
@@ -14,7 +14,7 @@ echo "This process requires you to have the following 
installed through your dis
  git
  and all of the ioquake3 dependencies necessary for an ioquake3 server.
  If you do not have the necessary dependencies this script will bail out.
- Please post a message to http://community.ioquake.org/ asking for help and 
include whatever error messages you received during the compile phase.
+ Please post a message to http://discourse.ioquake.org/ asking for help and 
include whatever error messages you received during the compile phase.
  Please edit this script. Inside you will find a COPYDIR variable you can 
alter to change where ioquake3 will be installed to."
 while true; do
 read -p "Are you ready to compile ioquake3 in the $IOQ3LOCAL 
directory, and have it installed into $COPYDIR? " yn

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 19/59: Better gamepad support.

[Simon McVittie]

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

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

commit b7f2ebd477dde6c094bff1a04be38a069745
Author: SmileTheory 
Date:   Mon Aug 8 02:36:10 2016 -0700

Better gamepad support.
---
 code/client/cl_input.c |  24 --
 code/client/cl_keys.c  |  27 ++
 code/client/keycodes.h |  30 +++
 code/sdl/sdl_input.c   | 222 -
 4 files changed, 293 insertions(+), 10 deletions(-)

diff --git a/code/client/cl_input.c b/code/client/cl_input.c
index 296a7cc..f4089d7 100644
--- a/code/client/cl_input.c
+++ b/code/client/cl_input.c
@@ -392,6 +392,12 @@ CL_JoystickMove
 void CL_JoystickMove( usercmd_t *cmd ) {
float   anglespeed;
 
+   float yaw = j_yaw->value * cl.joystickAxis[j_yaw_axis->integer];
+   float right   = j_side->value* 
cl.joystickAxis[j_side_axis->integer];
+   float forward = j_forward->value * 
cl.joystickAxis[j_forward_axis->integer];
+   float pitch   = j_pitch->value   * 
cl.joystickAxis[j_pitch_axis->integer];
+   float up  = j_up->value  * cl.joystickAxis[j_up_axis->integer];
+
if ( !(in_speed.active ^ cl_run->integer) ) {
cmd->buttons |= BUTTON_WALKING;
}
@@ -403,22 +409,22 @@ void CL_JoystickMove( usercmd_t *cmd ) {
}
 
if ( !in_strafe.active ) {
-   cl.viewangles[YAW] += anglespeed * j_yaw->value * 
cl.joystickAxis[j_yaw_axis->integer];
-   cmd->rightmove = ClampChar( cmd->rightmove + (int) 
(j_side->value * cl.joystickAxis[j_side_axis->integer]) );
+   cl.viewangles[YAW] += anglespeed * yaw;
+   cmd->rightmove = ClampChar( cmd->rightmove + (int)right );
} else {
-   cl.viewangles[YAW] += anglespeed * j_side->value * 
cl.joystickAxis[j_side_axis->integer];
-   cmd->rightmove = ClampChar( cmd->rightmove + (int) 
(j_yaw->value * cl.joystickAxis[j_yaw_axis->integer]) );
+   cl.viewangles[YAW] += anglespeed * right;
+   cmd->rightmove = ClampChar( cmd->rightmove + (int)yaw );
}
 
if ( in_mlooking ) {
-   cl.viewangles[PITCH] += anglespeed * j_forward->value * 
cl.joystickAxis[j_forward_axis->integer];
-   cmd->forwardmove = ClampChar( cmd->forwardmove + (int) 
(j_pitch->value * cl.joystickAxis[j_pitch_axis->integer]) );
+   cl.viewangles[PITCH] += anglespeed * forward;
+   cmd->forwardmove = ClampChar( cmd->forwardmove + (int)pitch );
} else {
-   cl.viewangles[PITCH] += anglespeed * j_pitch->value * 
cl.joystickAxis[j_pitch_axis->integer];
-   cmd->forwardmove = ClampChar( cmd->forwardmove + (int) 
(j_forward->value * cl.joystickAxis[j_forward_axis->integer]) );
+   cl.viewangles[PITCH] += anglespeed * pitch;
+   cmd->forwardmove = ClampChar( cmd->forwardmove + (int)forward );
}
 
-   cmd->upmove = ClampChar( cmd->upmove + (int) (j_up->value * 
cl.joystickAxis[j_up_axis->integer]) );
+   cmd->upmove = ClampChar( cmd->upmove + (int)up );
 }
 
 /*
diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c
index a6173dd..f73083a 100644
--- a/code/client/cl_keys.c
+++ b/code/client/cl_keys.c
@@ -289,6 +289,33 @@ keyname_t keynames[] =
{"EURO", K_EURO},
{"UNDO", K_UNDO},
 
+   {"PAD0_A", K_PAD0_A },
+   {"PAD0_B", K_PAD0_B },
+   {"PAD0_X", K_PAD0_X },
+   {"PAD0_Y", K_PAD0_Y },
+   {"PAD0_BACK", K_PAD0_BACK },
+   {"PAD0_GUIDE", K_PAD0_GUIDE },
+   {"PAD0_START", K_PAD0_START },
+   {"PAD0_LEFTSTICK_CLICK", K_PAD0_LEFTSTICK_CLICK },
+   {"PAD0_RIGHTSTICK_CLICK", K_PAD0_RIGHTSTICK_CLICK },
+   {"PAD0_LEFTSHOULDER", K_PAD0_LEFTSHOULDER },
+   {"PAD0_RIGHTSHOULDER", K_PAD0_RIGHTSHOULDER },
+   {"PAD0_DPAD_UP", K_PAD0_DPAD_UP },
+   {"PAD0_DPAD_DOWN", K_PAD0_DPAD_DOWN },
+   {"PAD0_DPAD_LEFT", K_PAD0_DPAD_LEFT },
+   {"PAD0_DPAD_RIGHT", K_PAD0_DPAD_RIGHT },
+
+   {"PAD0_LEFTSTICK_LEFT", K_PAD0_LEFTSTICK_LEFT },
+   {"PAD0_LEFTSTICK_RIGHT", K_PAD0_LEFTSTICK_RIGHT },
+   {"PAD0_LEFTSTICK_UP", K_PAD0_LEFTSTICK_UP },
+   {"PAD0_LEFTSTICK_DOWN", K_PAD0_LEFTSTICK_DOWN },
+   {"PAD0_RIGHTSTICK_LEFT", K_PAD0_RIGHTSTICK_LEFT },
+   {"PAD0_RIGHTSTICK_RIGHT", K_PAD0_RIGHTSTICK_RIGHT },
+   {"PAD0_RIGHTSTICK_UP", K_PAD0_RIGHTSTICK_UP },
+   {"PAD0_RIGHTSTICK_DOWN", K_PAD0_RIGHTSTICK_DOWN },
+   {"PAD0_LEFTTRIGGER", K_PAD0_LEFTTRIGGER },
+   {"PAD0_RIGHTTRIGGER", K_PAD0_RIGHTTRIGGER },
+
{NULL,0}
 };
 
diff --git a/code/client/keycodes.h b/code/client/keycodes.h
index 706ca1b..e813368 100644
--- a/code/client/keycodes.h
+++ b/code/client/keycodes.h
@@ -260,6 +260,36 @@ typedef enum {
K_EURO,
K_UNDO,
 
+   // Gamepad controls
+   // Ordered to match SDL2 game controller 

[ioquake3] 16/59: Better defaults for joystick axes.

[Simon McVittie]

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

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

commit 1972128927d14daf035e6eeb93797b2cb10c0531
Author: SmileTheory 
Date:   Thu Aug 4 21:31:26 2016 -0700

Better defaults for joystick axes.

These changed from SDL1->SDL2 afaict.
---
 code/client/cl_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 0c7142c..145fbfd 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -3582,13 +3582,13 @@ void CL_Init( void ) {
j_yaw =  Cvar_Get ("j_yaw",  "-0.022", CVAR_ARCHIVE);
j_forward =  Cvar_Get ("j_forward",  "-0.25", CVAR_ARCHIVE);
j_side = Cvar_Get ("j_side", "0.25", CVAR_ARCHIVE);
-   j_up =   Cvar_Get ("j_up",   "1", CVAR_ARCHIVE);
+   j_up =   Cvar_Get ("j_up",   "0", CVAR_ARCHIVE);
 
j_pitch_axis =   Cvar_Get ("j_pitch_axis",   "3", CVAR_ARCHIVE);
-   j_yaw_axis = Cvar_Get ("j_yaw_axis", "4", CVAR_ARCHIVE);
+   j_yaw_axis = Cvar_Get ("j_yaw_axis", "2", CVAR_ARCHIVE);
j_forward_axis = Cvar_Get ("j_forward_axis", "1", CVAR_ARCHIVE);
j_side_axis =Cvar_Get ("j_side_axis","0", CVAR_ARCHIVE);
-   j_up_axis =  Cvar_Get ("j_up_axis",  "2", CVAR_ARCHIVE);
+   j_up_axis =  Cvar_Get ("j_up_axis",  "4", CVAR_ARCHIVE);
 
Cvar_CheckRange(j_pitch_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);
Cvar_CheckRange(j_yaw_axis, 0, MAX_JOYSTICK_AXIS-1, qtrue);

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 18/59: Minor updates to README.md

[Simon McVittie]

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

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

commit 879fb555a50a94a723291aaea68dda389a0361c2
Author: Zachary J. Slater 
Date:   Thu Aug 4 21:05:33 2016 -1000

Minor updates to README.md

Removed some language about the old mailing list, pointed to forums,
and more accurately to the
wiki, updated reference to SDL.
Zardoz speaks to you, His chosen ones.
---
 README.md | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3e004ad..f759412 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,15 @@ use a modern copy from http://icculus.org/gtkradiant/.
 
 The original id software readme that accompanied the Q3 source release has been
 renamed to id-readme.txt so as to prevent confusion. Please refer to the
-web-site for updated status.
+website for updated status.
 
-More documentation is on:
+More documentation including a Player's Guide and Sysadmin Guide is on:
 http://wiki.ioquake3.org/
 
+If you've got issues that you aren't sure are worth filing as bugs, or just
+want to chat, please visit our forums:
+http://discourse.ioquake.org
+
 # Compilation and installation
 
 For *nix
@@ -481,6 +485,7 @@ The focus for ioq3 is to develop a stable base suitable for 
further development
 and provide players with the same Quake 3 experience they've had for years.
 
 We do have graphical improvements with the new renderer, but they are off by 
default.
+See opengl2-readme.md for more information.
 
 # Building Official Installers
 
@@ -503,13 +508,11 @@ but we have some general guidelines:
 providing pak0.pk3 and the patch pk3s are not referred to or included in 
the
 installer.
 
-  * Please include at least an SDL so/dylib/dll on every platform.
+  * Please include at least a libSDL2 so/dylib/dll on every platform.
 
   * Please include an OpenAL so/dylib/dll, since every platform should be using
 it by now.
 
-  * Please contact the mailing list when you've made your installer.
-
   * Please be prepared to alter your installer on the whim of the maintainers.
 
   * Your installer will be mirrored to an "official" directory, thus making it

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 20/59: Fix stricmp usage in previous commit.

[Simon McVittie]

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

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

commit 6262972488a80657f5ef837c20b079799be7a731
Author: SmileTheory 
Date:   Mon Aug 8 02:43:02 2016 -0700

Fix stricmp usage in previous commit.
---
 code/sdl/sdl_input.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 4744e0e..802af4d 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -537,52 +537,52 @@ static qboolean KeyToAxisAndSign(int keynum, int 
*outAxis, int *outSign)
 
*outSign = 0;
 
-   if (stricmp(bind, "+forward") == 0)
+   if (Q_stricmp(bind, "+forward") == 0)
{
*outAxis = j_forward_axis->integer;
*outSign = j_forward->value > 0.0f ? 1 : -1;
}
-   else if (stricmp(bind, "+back") == 0)
+   else if (Q_stricmp(bind, "+back") == 0)
{
*outAxis = j_forward_axis->integer;
*outSign = j_forward->value > 0.0f ? -1 : 1;
}
-   else if (stricmp(bind, "+moveleft") == 0)
+   else if (Q_stricmp(bind, "+moveleft") == 0)
{
*outAxis = j_side_axis->integer;
*outSign = j_side->value > 0.0f ? -1 : 1;
}
-   else if (stricmp(bind, "+moveright") == 0)
+   else if (Q_stricmp(bind, "+moveright") == 0)
{
*outAxis = j_side_axis->integer;
*outSign = j_side->value > 0.0f ? 1 : -1;
}
-   else if (stricmp(bind, "+lookup") == 0)
+   else if (Q_stricmp(bind, "+lookup") == 0)
{
*outAxis = j_pitch_axis->integer;
*outSign = j_pitch->value > 0.0f ? -1 : 1;
}
-   else if (stricmp(bind, "+lookdown") == 0)
+   else if (Q_stricmp(bind, "+lookdown") == 0)
{
*outAxis = j_pitch_axis->integer;
*outSign = j_pitch->value > 0.0f ? 1 : -1;
}
-   else if (stricmp(bind, "+left") == 0)
+   else if (Q_stricmp(bind, "+left") == 0)
{
*outAxis = j_yaw_axis->integer;
*outSign = j_yaw->value > 0.0f ? 1 : -1;
}
-   else if (stricmp(bind, "+right") == 0)
+   else if (Q_stricmp(bind, "+right") == 0)
{
*outAxis = j_yaw_axis->integer;
*outSign = j_yaw->value > 0.0f ? -1 : 1;
}
-   else if (stricmp(bind, "+moveup") == 0)
+   else if (Q_stricmp(bind, "+moveup") == 0)
{
*outAxis = j_up_axis->integer;
*outSign = j_up->value > 0.0f ? 1 : -1;
}
-   else if (stricmp(bind, "+movedown") == 0)
+   else if (Q_stricmp(bind, "+movedown") == 0)
{
*outAxis = j_up_axis->integer;
*outSign = j_up->value > 0.0f ? -1 : 1;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 15/59: OpenGL2: Fix shader error logs.

[Simon McVittie]

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

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

commit 5252e28163fd0f4cb5dcc0bc073962a87a121cde
Author: SmileTheory 
Date:   Thu Aug 4 20:16:22 2016 -0700

OpenGL2: Fix shader error logs.
---
 code/renderergl2/tr_glsl.c | 95 ++
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c
index d2bfbda..f934942 100644
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@@ -148,8 +148,15 @@ static uniformInfo_t uniformsInfo[] =
{ "u_CubeMapInfo", GLSL_VEC4 },
 };
 
+typedef enum
+{
+   GLSL_PRINTLOG_PROGRAM_INFO,
+   GLSL_PRINTLOG_SHADER_INFO,
+   GLSL_PRINTLOG_SHADER_SOURCE
+}
+glslPrintLog_t;
 
-static void GLSL_PrintInfoLog(GLuint program, qboolean developerOnly)
+static void GLSL_PrintLog(GLuint programOrShader, glslPrintLog_t type, 
qboolean developerOnly)
 {
char   *msg;
static char msgPart[1024];
@@ -157,61 +164,70 @@ static void GLSL_PrintInfoLog(GLuint program, qboolean 
developerOnly)
int i;
int printLevel = developerOnly ? PRINT_DEVELOPER : 
PRINT_ALL;
 
-   qglGetProgramiv(program, GL_INFO_LOG_LENGTH, );
+   switch (type)
+   {
+   case GLSL_PRINTLOG_PROGRAM_INFO:
+   ri.Printf(printLevel, "Program info log:\n");
+   qglGetProgramiv(programOrShader, GL_INFO_LOG_LENGTH, 
);
+   break;
+
+   case GLSL_PRINTLOG_SHADER_INFO:
+   ri.Printf(printLevel, "Shader info log:\n");
+   qglGetShaderiv(programOrShader, GL_INFO_LOG_LENGTH, 
);
+   break;
+
+   case GLSL_PRINTLOG_SHADER_SOURCE:
+   ri.Printf(printLevel, "Shader source:\n");
+   qglGetShaderiv(programOrShader, 
GL_SHADER_SOURCE_LENGTH, );
+   break;
+   }
 
if (maxLength <= 0)
{
-   ri.Printf(printLevel, "No compile log.\n");
+   ri.Printf(printLevel, "None.\n");
return;
}
 
-   ri.Printf(printLevel, "compile log:\n");
-
if (maxLength < 1023)
+   msg = msgPart;
+   else
+   msg = ri.Malloc(maxLength);
+
+   switch (type)
{
-   qglGetProgramInfoLog(program, maxLength, , msgPart);
+   case GLSL_PRINTLOG_PROGRAM_INFO:
+   qglGetProgramInfoLog(programOrShader, maxLength, 
, msg);
+   break;
+
+   case GLSL_PRINTLOG_SHADER_INFO:
+   qglGetShaderInfoLog(programOrShader, maxLength, 
, msg);
+   break;
 
+   case GLSL_PRINTLOG_SHADER_SOURCE:
+   qglGetShaderSource(programOrShader, maxLength, 
, msg);
+   break;
+   }
+
+   if (maxLength < 1023)
+   {
msgPart[maxLength + 1] = '\0';
 
ri.Printf(printLevel, "%s\n", msgPart);
}
else
{
-   msg = ri.Malloc(maxLength);
-
-   qglGetProgramInfoLog(program, maxLength, , msg);
-
-   for(i = 0; i < maxLength; i += 1024)
+   for(i = 0; i < maxLength; i += 1023)
{
Q_strncpyz(msgPart, msg + i, sizeof(msgPart));
 
-   ri.Printf(printLevel, "%s\n", msgPart);
+   ri.Printf(printLevel, "%s", msgPart);
}
 
-   ri.Free(msg);
-   }
-}
+   ri.Printf(printLevel, "\n");
 
-static void GLSL_PrintShaderSource(GLuint shader)
-{
-   char   *msg;
-   static char msgPart[1024];
-   int maxLength = 0;
-   int i;
-
-   qglGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, );
-
-   msg = ri.Malloc(maxLength);
-
-   qglShaderSource(shader, 1, (const GLchar **), );
-
-   for(i = 0; i < maxLength; i += 1024)
-   {
-   Q_strncpyz(msgPart, msg + i, sizeof(msgPart));
-   ri.Printf(PRINT_ALL, "%s\n", msgPart);
+   ri.Free(msg);
}
 
-   ri.Free(msg);
 }
 
 static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char 
*dest, int size )
@@ -365,15 +381,12 @@ static int GLSL_CompileGPUShader(GLuint program, GLuint 
*prevShader, const GLcha
qglGetShaderiv(shader, GL_COMPILE_STATUS, );
if(!compiled)
{
-   GLSL_PrintShaderSource(shader);
-   GLSL_PrintInfoLog(shader, qfalse);
+   GLSL_PrintLog(shader, GLSL_PRINTLOG_SHADER_SOURCE, qfalse);
+   GLSL_PrintLog(shader, GLSL_PRINTLOG_SHADER_INFO, qfalse);
ri.Error(ERR_DROP, "Couldn't compile shader");
return 0;
   

[ioquake3] 12/59: Merge pull request #197 from tkoeppe/null

[Simon McVittie]

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

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

commit 1051df45e3ba640ffe5b3bbf74526003865f1e26
Merge: 7164381 bbe99a8
Author: Tim Angus 
Date:   Tue Jul 26 11:03:22 2016 +0100

Merge pull request #197 from tkoeppe/null

[null/null_glimp.c] Fix bitrot in null impl

 code/null/null_glimp.c | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 11/59: [null/null_glimp.c] Fix up bitrot in null impl

[Simon McVittie]

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

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

commit bbe99a8c6b62f7234acaeb35d26dbb10c2783e6b
Author: Thomas Köppe 
Date:   Tue Jul 26 10:52:15 2016 +0100

[null/null_glimp.c] Fix up bitrot in null impl
---
 code/null/null_glimp.c | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/null/null_glimp.c b/code/null/null_glimp.c
index 2fc6aff..558d2d1 100644
--- a/code/null/null_glimp.c
+++ b/code/null/null_glimp.c
@@ -19,7 +19,7 @@ along with Quake III Arena source code; if not, write to the 
Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===
 */
-#include "tr_common.h"
+#include "../renderercommon/tr_common.h"
 
 
 qboolean ( * qwglSwapIntervalEXT)( int interval );
@@ -35,8 +35,7 @@ void ( * qglUnlockArraysEXT) ( void );
 void   GLimp_EndFrame( void ) {
 }
 
-intGLimp_Init( void )
-{
+void   GLimp_Init( void ) {
 }
 
 void   GLimp_Shutdown( void ) {
@@ -45,12 +44,18 @@ voidGLimp_Shutdown( void ) {
 void   GLimp_EnableLogging( qboolean enable ) {
 }
 
-void GLimp_LogComment( char *comment ) {
+void   GLimp_LogComment( char *comment ) {
 }
 
-qboolean QGL_Init( const char *dllname ) {
+qboolean   QGL_Init( const char *dllname ) {
return qtrue;
 }
 
 void   QGL_Shutdown( void ) {
 }
+
+void   GLimp_SetGamma( unsigned char red[256], unsigned char 
green[256], unsigned char blue[256] ) {
+}
+
+void   GLimp_Minimize( void ) {
+}

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 14/59: OpenGL2: Let unlit materials use parallax maps.

[Simon McVittie]

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

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

commit 29ac1171544bdbb5c61956f672753e7059c62a35
Author: SmileTheory 
Date:   Fri Jul 29 01:53:50 2016 -0700

OpenGL2: Let unlit materials use parallax maps.
---
 code/renderergl2/tr_glsl.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c
index 50770da..d2bfbda 100644
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@@ -1004,9 +1004,6 @@ void GLSL_InitGPUShaders(void)
if ((i & LIGHTDEF_USE_PARALLAXMAP) && 
!r_parallaxMapping->integer)
continue;
 
-   if (!lightType && (i & LIGHTDEF_USE_PARALLAXMAP))
-   continue;
-
if (!lightType && (i & LIGHTDEF_USE_SHADOWMAP))
continue;
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 08/59: [botlib] Use floating point absolute value rather than truncate to integer

[Simon McVittie]

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

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

commit 18d6c8fda279907e2d140e03c8f322bc8d1a4762
Author: Thomas Köppe 
Date:   Mon Jul 25 18:30:48 2016 +0100

[botlib] Use floating point absolute value rather than truncate to integer
---
 code/botlib/be_aas_entity.c | 4 ++--
 code/botlib/be_aas_move.c   | 2 +-
 code/botlib/be_aas_reach.c  | 8 
 code/botlib/be_ai_move.c| 2 +-
 code/tools/asm/q3asm.c  | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/botlib/be_aas_entity.c b/code/botlib/be_aas_entity.c
index 02699bd..c78f9e7 100644
--- a/code/botlib/be_aas_entity.c
+++ b/code/botlib/be_aas_entity.c
@@ -390,9 +390,9 @@ int AAS_NearestEntity(vec3_t origin, int modelindex)
ent = [i];
if (ent->i.modelindex != modelindex) continue;
VectorSubtract(ent->i.origin, origin, dir);
-   if (abs(dir[0]) < 40)
+   if (fabsf(dir[0]) < 40)
{
-   if (abs(dir[1]) < 40)
+   if (fabsf(dir[1]) < 40)
{
dist = VectorLength(dir);
if (dist < bestdist)
diff --git a/code/botlib/be_aas_move.c b/code/botlib/be_aas_move.c
index c42b6cc..9ce95c6 100644
--- a/code/botlib/be_aas_move.c
+++ b/code/botlib/be_aas_move.c
@@ -168,7 +168,7 @@ int AAS_AgainstLadder(vec3_t origin)
//get the plane the face is in
plane = [face->planenum ^ side];
//if the origin is pretty close to the plane
-   if (abs(DotProduct(plane->normal, origin) - plane->dist) < 3)
+   if (fabsf(DotProduct(plane->normal, origin) - plane->dist) < 3)
{
if (AAS_PointInsideFace(abs(facenum), origin, 0.1f)) 
return qtrue;
} //end if
diff --git a/code/botlib/be_aas_reach.c b/code/botlib/be_aas_reach.c
index 379948a..62acd47 100644
--- a/code/botlib/be_aas_reach.c
+++ b/code/botlib/be_aas_reach.c
@@ -2465,8 +2465,8 @@ int AAS_Reachability_Ladder(int area1num, int area2num)
VectorMA(area1point, -32, dir, area1point);
VectorMA(area2point, 32, dir, area2point);
//
-   ladderface1vertical = abs(DotProduct(plane1->normal, up)) < 0.1;
-   ladderface2vertical = abs(DotProduct(plane2->normal, up)) < 0.1;
+   ladderface1vertical = fabsf(DotProduct(plane1->normal, up)) < 
0.1;
+   ladderface2vertical = fabsf(DotProduct(plane2->normal, up)) < 
0.1;
//there's only reachability between vertical ladder faces
if (!ladderface1vertical && !ladderface2vertical) return qfalse;
//if both vertical ladder faces
@@ -2474,7 +2474,7 @@ int AAS_Reachability_Ladder(int area1num, int area2num)
//and the ladder faces do not make a 
sharp corner
&& DotProduct(plane1->normal, 
plane2->normal) > 0.7
//and the shared edge is not too 
vertical
-   && abs(DotProduct(sharededgevec, up)) < 
0.7)
+   && fabsf(DotProduct(sharededgevec, up)) 
< 0.7)
{
//create a new reachability link
lreach = AAS_AllocReachability();
@@ -2599,7 +2599,7 @@ int AAS_Reachability_Ladder(int area1num, int area2num)
if (face2->faceflags & FACE_LADDER)
{
plane2 = 
[face2->planenum];
-   if (abs(DotProduct(plane2->normal, up)) 
< 0.1) break;
+   if (fabsf(DotProduct(plane2->normal, 
up)) < 0.1) break;
} //end if
} //end for
//if from another area without vertical ladder faces
diff --git a/code/botlib/be_ai_move.c b/code/botlib/be_ai_move.c
index 0c4de34..42232d6 100644
--- a/code/botlib/be_ai_move.c
+++ b/code/botlib/be_ai_move.c
@@ -2054,7 +2054,7 @@ bot_moveresult_t BotTravel_Elevator(bot_movestate_t *ms, 
aas_reachability_t *rea
botimport.Print(PRT_MESSAGE, "bot on elevator\n");
 #endif //DEBUG_ELEVATOR
//if vertically not too far from the end point
-   if (abs(ms->origin[2] - reach->end[2]) < sv_maxbarrier->value)
+   if (fabsf(ms->origin[2] - reach->end[2]) < sv_maxbarrier->value)
{
 #ifdef DEBUG_ELEVATOR
botimport.Print(PRT_MESSAGE, "bot moving to end\n");
diff --git a/code/tools/asm/q3asm.c b/code/tools/asm/q3asm.c
index 54c6ab1..8be0124 100644
--- a/code/tools/asm/q3asm.c
+++ b/code/tools/asm/q3asm.c
@@ -1644,3 

[ioquake3] 10/59: OpenGL2: Use loader for all extension funcs.

[Simon McVittie]

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

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

commit 716438168f160885fe1d8cc2e076e97901bd436c
Author: SmileTheory 
Date:   Tue Jul 26 00:41:31 2016 -0700

OpenGL2: Use loader for all extension funcs.
---
 code/renderercommon/qgl.h| 202 +++--
 code/renderergl2/tr_backend.c|   2 +-
 code/renderergl2/tr_bsp.c|   2 +-
 code/renderergl2/tr_extensions.c | 208 ---
 code/renderergl2/tr_image.c  |   7 +-
 code/renderergl2/tr_init.c   |   2 +-
 code/renderergl2/tr_local.h  |   1 -
 code/renderergl2/tr_shade.c  |   8 +-
 code/renderergl2/tr_vbo.c|  14 +--
 9 files changed, 158 insertions(+), 288 deletions(-)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 6f27e13..6f70f64 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -438,14 +438,6 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
GLE(void, ValidateProgram, GLuint program) \
GLE(void, VertexAttribPointer, GLuint index, GLint size, GLenum type, 
GLboolean normalized, GLsizei stride, const void *pointer) \
 
-#define GLE(ret, name, ...) typedef ret APIENTRY name##proc(__VA_ARGS__); 
extern name##proc * qgl##name;
-QGL_1_2_PROCS
-QGL_1_3_PROCS
-QGL_1_4_PROCS
-QGL_1_5_PROCS
-QGL_2_0_PROCS
-#undef GLE
-
 // GL_NVX_gpu_memory_info
 #ifndef GL_NVX_gpu_memory_info
 #define GL_NVX_gpu_memory_info
@@ -495,27 +487,18 @@ QGL_2_0_PROCS
 #endif
 
 // GL_EXT_framebuffer_object
-extern GLboolean (APIENTRY * qglIsRenderbufferEXT)(GLuint renderbuffer);
-extern void (APIENTRY * qglBindRenderbufferEXT)(GLenum target, GLuint 
renderbuffer);
-extern void (APIENTRY * qglDeleteRenderbuffersEXT)(GLsizei n, const GLuint 
*renderbuffers);
-extern void (APIENTRY * qglGenRenderbuffersEXT)(GLsizei n, GLuint 
*renderbuffers);
-extern void (APIENTRY * qglRenderbufferStorageEXT)(GLenum target, GLenum 
internalformat, GLsizei width, GLsizei height);
-extern void (APIENTRY * qglGetRenderbufferParameterivEXT)(GLenum target, 
GLenum pname, GLint *params);
-extern GLboolean (APIENTRY * qglIsFramebufferEXT)(GLuint framebuffer);
-extern void (APIENTRY * qglBindFramebufferEXT)(GLenum target, GLuint 
framebuffer);
-extern void (APIENTRY * qglDeleteFramebuffersEXT)(GLsizei n, const GLuint 
*framebuffers);
-extern void (APIENTRY * qglGenFramebuffersEXT)(GLsizei n, GLuint 
*framebuffers);
-extern GLenum (APIENTRY * qglCheckFramebufferStatusEXT)(GLenum target);
-extern void (APIENTRY * qglFramebufferTexture1DEXT)(GLenum target, GLenum 
attachment, GLenum textarget, GLuint texture,
-   GLint level);
-extern void (APIENTRY * qglFramebufferTexture2DEXT)(GLenum target, GLenum 
attachment, GLenum textarget, GLuint texture,
-   GLint level);
-extern void (APIENTRY * qglFramebufferTexture3DEXT)(GLenum target, GLenum 
attachment, GLenum textarget, GLuint texture,
-   GLint level, GLint zoffset);
-extern void (APIENTRY * qglFramebufferRenderbufferEXT)(GLenum target, GLenum 
attachment, GLenum renderbuffertarget,
-   GLuint renderbuffer);
-extern void (APIENTRY * qglGetFramebufferAttachmentParameterivEXT)(GLenum 
target, GLenum attachment, GLenum pname, GLint *params);
-extern void (APIENTRY * qglGenerateMipmapEXT)(GLenum target);
+#define QGL_EXT_framebuffer_object_PROCS \
+   GLE(void, BindRenderbufferEXT, GLenum target, GLuint renderbuffer) \
+   GLE(void, DeleteRenderbuffersEXT, GLsizei n, const GLuint 
*renderbuffers) \
+   GLE(void, GenRenderbuffersEXT, GLsizei n, GLuint *renderbuffers) \
+   GLE(void, RenderbufferStorageEXT, GLenum target, GLenum internalformat, 
GLsizei width, GLsizei height) \
+   GLE(void, BindFramebufferEXT, GLenum target, GLuint framebuffer) \
+   GLE(void, DeleteFramebuffersEXT, GLsizei n, const GLuint *framebuffers) 
\
+   GLE(void, GenFramebuffersEXT, GLsizei n, GLuint *framebuffers) \
+   GLE(GLenum, CheckFramebufferStatusEXT, GLenum target) \
+   GLE(void, FramebufferTexture2DEXT, GLenum target, GLenum attachment, 
GLenum textarget, GLuint texture, GLint level) \
+   GLE(void, FramebufferRenderbufferEXT, GLenum target, GLenum attachment, 
GLenum renderbuffertarget, GLuint renderbuffer) \
+   GLE(void, GenerateMipmapEXT, GLenum target) \
 
 #ifndef GL_EXT_framebuffer_object
 #define GL_EXT_framebuffer_object
@@ -572,19 +555,9 @@ extern void (APIENTRY * qglGenerateMipmapEXT)(GLenum 
target);
 #define GL_INVALID_FRAMEBUFFER_OPERATION_EXT   0x0506
 #endif
 
-// GL_EXT_packed_depth_stencil
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT  0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT  0x84FA
-#define GL_DEPTH24_STENCIL8_EXT   0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT   0x88F1
-#endif
-
 // 

[ioquake3] 07/59: [tools/asm/q3asm.c] Remove 'abs(unsigned)', which is unnecessary and potentially wrong

[Simon McVittie]

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

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

commit 9a5add2b604e9d6e5120d1c748e311f895e71908
Author: Thomas Köppe 
Date:   Mon Jul 25 18:30:15 2016 +0100

[tools/asm/q3asm.c] Remove 'abs(unsigned)', which is unnecessary and 
potentially wrong
---
 code/tools/asm/q3asm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/tools/asm/q3asm.c b/code/tools/asm/q3asm.c
index 191a9db..54c6ab1 100644
--- a/code/tools/asm/q3asm.c
+++ b/code/tools/asm/q3asm.c
@@ -477,7 +477,7 @@ static unsigned int HashString (const char *key)
 acc = (acc << 2) | (acc >> 30);
 acc &= 0xU;
 }
-return abs(acc);
+return acc;
 }
 
 
@@ -1644,4 +1644,3 @@ Motivation: not wanting to scrollback for pages to find 
asm error.
 
return errorCount;
 }
-

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 09/59: Merge pull request #195 from tkoeppe/intfix

[Simon McVittie]

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

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

commit 2ef99c8528b93fa7367565756a30d09850ff3673
Merge: f0086e8 18d6c8f
Author: Tim Angus 
Date:   Mon Jul 25 21:08:07 2016 +0100

Merge pull request #195 from tkoeppe/intfix

Fix signedness and float/int issues with abs()

 code/botlib/be_aas_entity.c | 4 ++--
 code/botlib/be_aas_move.c   | 2 +-
 code/botlib/be_aas_reach.c  | 8 
 code/botlib/be_ai_move.c| 2 +-
 code/tools/asm/q3asm.c  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 13/59: OpenGL2: Fix GL_EXT_direct_state_access function names.

[Simon McVittie]

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

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

commit e022abeebb83e38431f010afd652b8de32ab0c1a
Author: SmileTheory 
Date:   Thu Jul 28 20:04:25 2016 -0700

OpenGL2: Fix GL_EXT_direct_state_access function names.
---
 code/renderercommon/qgl.h| 42 +--
 code/renderergl2/tr_backend.c| 20 -
 code/renderergl2/tr_dsa.c| 46 ++--
 code/renderergl2/tr_dsa.h| 42 +--
 code/renderergl2/tr_extensions.c | 90 
 code/renderergl2/tr_fbo.c| 14 +++
 code/renderergl2/tr_glsl.c   | 14 +++
 code/renderergl2/tr_image.c  | 48 ++---
 8 files changed, 113 insertions(+), 203 deletions(-)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 6f70f64..6d8629f 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -617,27 +617,27 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 
 // GL_EXT_direct_state_access
 #define QGL_EXT_direct_state_access_PROCS \
-   GLE(GLvoid, BindMultiTexture, GLenum texunit, GLenum target, GLuint 
texture) \
-   GLE(GLvoid, TextureParameterf, GLuint texture, GLenum target, GLenum 
pname, GLfloat param) \
-   GLE(GLvoid, TextureParameteri, GLuint texture, GLenum target, GLenum 
pname, GLint param) \
-   GLE(GLvoid, TextureImage2D, GLuint texture, GLenum target, GLint level, 
GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum 
format, GLenum type, const GLvoid *pixels) \
-   GLE(GLvoid, TextureSubImage2D, GLuint texture, GLenum target, GLint 
level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum 
format, GLenum type, const GLvoid *pixels) \
-   GLE(GLvoid, CopyTextureImage2D, GLuint texture, GLenum target, GLint 
level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, 
GLint border) \
-   GLE(GLvoid, CompressedTextureImage2D, GLuint texture, GLenum target, 
GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint 
border, GLsizei imageSize, const GLvoid *data) \
-   GLE(GLvoid, CompressedTextureSubImage2D, GLuint texture, GLenum target, 
GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, 
GLenum format, GLsizei imageSize, const GLvoid *data) \
-   GLE(GLvoid, GenerateTextureMipmap, GLuint texture, GLenum target) \
-   GLE(GLvoid, ProgramUniform1i, GLuint program, GLint location, GLint v0) 
\
-   GLE(GLvoid, ProgramUniform1f, GLuint program, GLint location, GLfloat 
v0) \
-   GLE(GLvoid, ProgramUniform2f, GLuint program, GLint location, GLfloat 
v0, GLfloat v1) \
-   GLE(GLvoid, ProgramUniform3f, GLuint program, GLint location, GLfloat 
v0, GLfloat v1, GLfloat v2) \
-   GLE(GLvoid, ProgramUniform4f, GLuint program, GLint location, GLfloat 
v0, GLfloat v1, GLfloat v2, GLfloat v3) \
-   GLE(GLvoid, ProgramUniform1fv, GLuint program, GLint location, GLsizei 
count, const GLfloat *value) \
-   GLE(GLvoid, ProgramUniformMatrix4fv, GLuint program, GLint location, 
GLsizei count, GLboolean transpose, const GLfloat *value) \
-   GLE(GLvoid, NamedRenderbufferStorage, GLuint renderbuffer, GLenum 
internalformat, GLsizei width, GLsizei height) \
-   GLE(GLvoid, NamedRenderbufferStorageMultisample, GLuint renderbuffer, 
GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) \
-   GLE(GLenum, CheckNamedFramebufferStatus, GLuint framebuffer, GLenum 
target) \
-   GLE(GLvoid, NamedFramebufferTexture2D, GLuint framebuffer, GLenum 
attachment, GLenum textarget, GLuint texture, GLint level) \
-   GLE(GLvoid, NamedFramebufferRenderbuffer, GLuint framebuffer, GLenum 
attachment, GLenum renderbuffertarget, GLuint renderbuffer) \
+   GLE(GLvoid, BindMultiTextureEXT, GLenum texunit, GLenum target, GLuint 
texture) \
+   GLE(GLvoid, TextureParameterfEXT, GLuint texture, GLenum target, GLenum 
pname, GLfloat param) \
+   GLE(GLvoid, TextureParameteriEXT, GLuint texture, GLenum target, GLenum 
pname, GLint param) \
+   GLE(GLvoid, TextureImage2DEXT, GLuint texture, GLenum target, GLint 
level, GLint internalformat, GLsizei width, GLsizei height, GLint border, 
GLenum format, GLenum type, const GLvoid *pixels) \
+   GLE(GLvoid, TextureSubImage2DEXT, GLuint texture, GLenum target, GLint 
level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum 
format, GLenum type, const GLvoid *pixels) \
+   GLE(GLvoid, CopyTextureImage2DEXT, GLuint texture, GLenum target, GLint 
level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, 
GLint border) \
+   GLE(GLvoid, CompressedTextureImage2DEXT, GLuint texture, GLenum target, 
GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint 
border, GLsizei imageSize, const GLvoid *data) \
+   

[ioquake3] 02/59: Fix bot team order to kill last player it killed

[Simon McVittie]

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

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

commit 4474297af88436d07d348a10dedb8aa65c0d9dbf
Author: Zack Middleton 
Date:   Sun Jul 10 00:36:21 2016 -0500

Fix bot team order to kill last player it killed

Bot's lastkilledplayer was set to -1 after carrying out an ordered kill.
Later in BotChat_Random() the PlayerName function was passed -1 which
caused a "Error: PlayerName: playernum out of range" message.

I think the reason it was set to negative one is so that if the bot is
ordered to kill the player again, the bot will not say it's done and
drop the goal. Though, if the bot killed the player based on it's own
decision, it will just say it's done and drop the goal (bug?).

Let's check the time of the last kill to see if it happened since the
team order was received instead of setting lastkilledplayer to -1
after completing the team ordered kill. This fixes bot dropping goal
if target player was the last player they killed and the PlayerName
out of range error.
---
 code/game/ai_dmnet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/game/ai_dmnet.c b/code/game/ai_dmnet.c
index 38a84a4..73bc4ca 100644
--- a/code/game/ai_dmnet.c
+++ b/code/game/ai_dmnet.c
@@ -573,11 +573,10 @@ int BotGetLongTermGoal(bot_state_t *bs, int tfl, int 
retreat, bot_goal_t *goal)
bs->teammessage_time = 0;
}
//
-   if (bs->lastkilledplayer == bs->teamgoal.entitynum) {
+   if (bs->killedenemy_time > bs->teamgoal_time - 
TEAM_KILL_SOMEONE && bs->lastkilledplayer == bs->teamgoal.entitynum) {
EasyClientName(bs->teamgoal.entitynum, buf, 
sizeof(buf));
BotAI_BotInitialChat(bs, "kill_done", buf, NULL);
trap_BotEnterChat(bs->cs, bs->decisionmaker, CHAT_TELL);
-   bs->lastkilledplayer = -1;
bs->ltgtype = 0;
}
//

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 01/59: Fix typo of empty in ai_main.c

[Simon McVittie]

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

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

commit 274fa898b1cbadd444a2641c93c0f7daadba9af6
Author: Zack Middleton 
Date:   Mon Jun 27 21:13:27 2016 -0500

Fix typo of empty in ai_main.c
---
 code/game/ai_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/ai_main.c b/code/game/ai_main.c
index b9034b8..2dacd87 100644
--- a/code/game/ai_main.c
+++ b/code/game/ai_main.c
@@ -256,7 +256,7 @@ void BotTestAAS(vec3_t origin) {
if (bot_testsolid.integer) {
if (!trap_AAS_Initialized()) return;
areanum = BotPointAreaNum(origin);
-   if (areanum) BotAI_Print(PRT_MESSAGE, "\remtpy area");
+   if (areanum) BotAI_Print(PRT_MESSAGE, "\rempty area");
else BotAI_Print(PRT_MESSAGE, "\r^1SOLID area");
}
else if (bot_testclusters.integer) {

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] branch debian/master updated (4d254b7 -> 87e6112)

[Simon McVittie]

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

smcv pushed a change to branch debian/master
in repository ioquake3.

  from  4d254b7   1.36+u20160616+dfsg1-1
   new  5932a11   debian/watch: mangle Debian version correctly
   new  7709223   Remove a leftover comment which is now misleading
   new  274fa89   Fix typo of empty in ai_main.c
   new  4474297   Fix bot team order to kill last player it killed
   new  0ad4381   Make using Yacc optional, disabled by default
   new  ebc7894   Fix OpenGL2 readme missing text in md
   new  251c983   OpenGL2: Require OpenGL 2.0.
   new  f0086e8   OpenGL2: Add new GL function loader.
   new  9a5add2   [tools/asm/q3asm.c] Remove 'abs(unsigned)', which is 
unnecessary and potentially wrong
   new  18d6c8f   [botlib] Use floating point absolute value rather than 
truncate to integer
   new  2ef99c8   Merge pull request #195 from tkoeppe/intfix
   new  7164381   OpenGL2: Use loader for all extension funcs.
   new  bbe99a8   [null/null_glimp.c] Fix up bitrot in null impl
   new  1051df4   Merge pull request #197 from tkoeppe/null
   new  e022abe   OpenGL2: Fix GL_EXT_direct_state_access function names.
   new  29ac117   OpenGL2: Let unlit materials use parallax maps.
   new  5252e28   OpenGL2: Fix shader error logs.
   new  1972128   Better defaults for joystick axes.
   new  d098668   Controller hot plug support.
   new  879fb55   Minor updates to README.md
   new  b7f2ebd   Better gamepad support.
   new  6262972   Fix stricmp usage in previous commit.
   new  f47aaa2   Minor URL change.
   new  1cf0b21   Fix black screen when in_joystick disabled but controller 
connected.
   new  fe8ac83   OpenGL2: Preallocate grid surfaces like other BSP 
surfaces.
   new  4ce600f   Missing bit of previous commit.
   new  4f9310d   Update SDL2 to 2.0.4
   new  e8c5b3a   Merge pull request #207 from MAN-AT-ARMS/sdl204
   new  966d39e   Add stripped SDL2 reference dll's to repo
   new  fb65e12   Merge pull request #212 from MAN-AT-ARMS/sdl204-stripped
   new  c5c01e7   Fix joystick w/o controller mapping not working with SDL 
update.
   new  3c8da8c   [game/ai_main.c] Use floating-point fabs() for 
floating-point values
   new  762f507   Merge pull request #213 from tkoeppe/abs
   new  dfbaf50   OpenGL2: Store normals/tangents as int16_t[4].
   new  f9e5712   OpenGL2: Fix missing bounds calculation when loading BSP 
surfaces.
   new  927c9cc   OpenGL2: Make R_FreeSurfaceGridMeshData() static.
   new  497a74f   Fix undefined behavior when shifting left by 32.
   new  ec37799   OpenGL2: Fix reversed VectorCopy4() usage.
   new  fe111df   [qcommon/msg.c] Remove dead code (which had undefined 
behaviour)
   new  7d063ba   Merge pull request #220 from tkoeppe/shift
   new  bbc9e26   OpenGL2: Fix more reversed VectorCopy4() usage.
   new  0eb72cd   [renderergl2/tr_main.c] Use floating-point fabsf() for 
floating-point values
   new  bd062f7   Merge pull request #216 from tkoeppe/abs
   new  90f2f02   [code/botlib/l_precomp.c] Fix string buffer overflow
   new  4c169ab   Merge pull request #221 from tkoeppe/strncpy
   new  4faf100   OpenGL2: Remove map color scaling and 
r_forceSunMapLightScale.
   new  8749d62   OpenGL2: Remove per fragment tangent space calculation 
code.
   new  8417c18   OpenGL2: Clamp entity lighting to more resemble OpenGL1.
   new  f9ef5eb   New upstream version 1.36+u20160914+dfsg1
   new  aeaad30   Merge tag 'upstream/1.36+u20160914+dfsg1' into 
debian/master
   new  bb1c527   New upstream snapshot
   new  87594a5   Remove ioquake3-dbg, rely on automatic dbgsym packages 
instead
   new  b5a8997   Mention improved get-orig-source in changelog
   new  7cfed5d   Bump debhelper compat level to 10
   new  4ff12c4   debian/rules: mark get-orig-source as a phony target
   new  76a29a2   debian/rules: re-indent options
   new  56d9b71   d/p/Fix-mis-spellings-of-separating-as-seperating.patch: 
fix spellings
   new  652ef15   debian/apparmor.d: allow mapping objects from 
/usr/lib/openarena-server
   new  87e6112   1.36+u20160914+dfsg1-1

The 59 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile   |  20 +
 README.md  |  14 +-
 code/botlib/be_aas_entity.c|   4 +-
 code/botlib/be_aas_move.c  |   2 +-
 code/botlib/be_aas_reach.c |   8 +-
 code/botlib/be_ai_move.c   |   2 +-
 code/botlib/l_precomp.c|   2 +-
 

[ioquake3] 04/59: Fix OpenGL2 readme missing text in md

[Simon McVittie]

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

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

commit ebc78947770a4a918be357e2731241e3ab6ec0b0
Author: James Canete 
Date:   Mon Jul 11 20:47:39 2016 -0700

Fix OpenGL2 readme missing text in md
---
 opengl2-readme.md | 72 +++
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/opengl2-readme.md b/opengl2-readme.md
index d2757d4..bbddc36 100644
--- a/opengl2-readme.md
+++ b/opengl2-readme.md
@@ -1,4 +1,4 @@
-OpenGL2
+# OpenGL2
 
 
 OpenGL2 is an alternate renderer for ioquake3.  It aims to implement modern
@@ -398,7 +398,7 @@ The first thing to notice is that this is basically the 
same as old Quake 3
 shader files.  The next thing to notice are the new keywords.  Here is what 
 they mean:
 
-  stage 
+  `stage `
 - State how this imagemap will be used by OpenGL2:
 diffuseMap- Standard, same as no stage entry
 normalMap - Image will be used as a normal map
@@ -407,7 +407,7 @@ they mean:
 specularMap   - Image will be used as a specular map with
 alpha treated as shininess.
 
-  specularReflectance  
+  `specularReflectance `
 - State how metallic this material is.  Metals typically have a high 
   specular and a low diffuse, so this is typically high for them, and low
   for other materials, such as plastic.  For typical values for various
@@ -415,18 +415,18 @@ they mean:
   down to the reflection calculator and look up its reflectance.  Default
   is 0.04, since most materials aren't metallic.
   
-  specularExponent 
+  `specularExponent `
 - State how shiny this material is.  Note that this is modulated by the 
   alpha channel of the specular map, so if it were set to 16, and the alpha
   channel of the specular map was set to 0.5, then the shininess would be
   set to 8.  Default 256.
 
-  normalScale  
+  `normalScale  `
 - State the X and Y scales of the normal map.  This is useful for 
increasing
   or decreasing the "strength" of the normal map, or entering negative 
values
   to flip the X and/or Y values.  Default 1 1.
 
-  parallaxDepth 
+  `parallaxDepth `
 - State the maximum depth of the parallax map.  This is a fairly sensitive
   value, and I recommend the default or lower.  Default 0.05.
 
@@ -506,8 +506,7 @@ and is the equivalent for 'exactVertex'.
 
 This adds a new keyword to sky materials, q3gl2_sun.  The syntax is:
 
-  q3gl2_sun   
-   
+q3gl2_sun   
 
   
 Note the first six parameters are the same as in q3map_sun or q3map_sunExt,
 and the last two indicate scaling factors for the map brightness and an ambient
@@ -519,21 +518,21 @@ There are currently two ways to use this in your own (and 
other people's) maps.
  'q3gl2_sun' line after your 'q3map_sun' line in your sky material, like
  so:
  
-textures/skies/bluesky
-{
-qer_editorimage textures/skies/bluesky.jpg
-
-surfaceparm nomarks
-surfaceparm noimpact
-surfaceparm nolightmap
-surfaceparm sky
-q3map_sunExt 240 238 200 100 195 35 3 16
-q3gl2_sun 240 238 200 50 195 35 1.0 0.2
-q3map_skylight 50 16
-q3map_lightimage $whiteimage
-
-skyparms env/bluesky - -
-}
+textures/skies/bluesky
+{
+  qer_editorimage textures/skies/bluesky.jpg
+
+  surfaceparm nomarks
+  surfaceparm noimpact
+  surfaceparm nolightmap
+  surfaceparm sky
+  q3map_sunExt 240 238 200 100 195 35 3 16
+  q3gl2_sun 240 238 200 50 195 35 1.0 0.2
+  q3map_skylight 50 16
+  q3map_lightimage $whiteimage
+
+  skyparms env/bluesky - -
+}
 
  The advantages with this method are that your map will continue to work
  with the old renderer with the sunlight baked into the lightmap, and it
@@ -543,20 +542,20 @@ There are currently two ways to use this in your own (and 
other people's) maps.
   2. Set r_sunlightMode to 2 and use 'q3gl2_sun' instead of 'q3map_sun' or
  'q3map_sunExt', like so:
   
-textures/skies/bluesky
-{
-qer_editorimage textures/skies/bluesky.jpg
+textures/skies/bluesky
+{
+  qer_editorimage textures/skies/bluesky.jpg
 
-surfaceparm nomarks
-surfaceparm noimpact
-surfaceparm nolightmap
-surfaceparm sky
-q3gl2_sun 240 238 200 50 195 35 0.5 0.2
-q3map_skylight 50 16
-q3map_lightimage $whiteimage
+  surfaceparm nomarks
+  surfaceparm noimpact
+  surfaceparm nolightmap
+  surfaceparm sky
+  q3gl2_sun 240 238 200 50 195 35 0.5 0.2
+  q3map_skylight 50 16
+  q3map_lightimage $whiteimage
 
-skyparms env/bluesky - -
-}
+  skyparms env/bluesky - -
+   

[ioquake3] 05/59: OpenGL2: Require OpenGL 2.0.

[Simon McVittie]

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

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

commit 251c98368132fad43245f9c1c9cbe23bec7bcf40
Author: SmileTheory 
Date:   Sun Jul 24 21:29:13 2016 -0700

OpenGL2: Require OpenGL 2.0.
---
 code/renderercommon/qgl.h | 168 -
 code/renderergl2/tr_backend.c |   6 +-
 code/renderergl2/tr_dsa.c |  38 +--
 code/renderergl2/tr_dsa.h |   2 +-
 code/renderergl2/tr_extensions.c  | 497 +-
 code/renderergl2/tr_glsl.c| 126 +-
 code/renderergl2/tr_init.c|   8 +-
 code/renderergl2/tr_local.h   |  10 +-
 code/renderergl2/tr_postprocess.c |   4 +-
 code/renderergl2/tr_shade.c   |   6 +-
 code/renderergl2/tr_surface.c |  16 +-
 code/renderergl2/tr_vbo.c |  68 +++---
 12 files changed, 316 insertions(+), 633 deletions(-)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 46ece09..9c514a9 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -377,102 +377,59 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 #define qglVertexPointer glVertexPointer
 #define qglViewport glViewport
 
-// GL_EXT_draw_range_elements
-extern void (APIENTRY * qglDrawRangeElementsEXT) (GLenum mode, GLuint 
start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-
-// GL_EXT_multi_draw_arrays
-extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint 
*first, const GLsizei *count, GLsizei primcount);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const 
GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-
-// GL_ARB_shading_language_100
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
-#endif
-
-// GL_ARB_vertex_program
-extern void (APIENTRY * qglVertexAttrib4fARB) (GLuint, GLfloat, GLfloat, 
GLfloat, GLfloat);
-extern void (APIENTRY * qglVertexAttrib4fvARB) (GLuint, const GLfloat *);
-extern void (APIENTRY * qglVertexAttribPointerARB) (GLuint index, GLint 
size, GLenum type, GLboolean normalized,
-   
GLsizei stride, const GLvoid * pointer);
-extern void (APIENTRY * qglEnableVertexAttribArrayARB) (GLuint index);
-extern void (APIENTRY * qglDisableVertexAttribArrayARB) (GLuint index);
-
-// GL_ARB_vertex_buffer_object
-extern void (APIENTRY * qglBindBufferARB) (GLenum target, GLuint buffer);
-extern void (APIENTRY * qglDeleteBuffersARB) (GLsizei n, const GLuint * 
buffers);
-extern void (APIENTRY * qglGenBuffersARB) (GLsizei n, GLuint * buffers);
-extern  GLboolean(APIENTRY * qglIsBufferARB) (GLuint buffer);
-extern void (APIENTRY * qglBufferDataARB) (GLenum target, GLsizeiptrARB 
size, const GLvoid * data, GLenum usage);
-extern void (APIENTRY * qglBufferSubDataARB) (GLenum target, GLintptrARB 
offset, GLsizeiptrARB size, const GLvoid * data);
-extern void (APIENTRY * qglGetBufferSubDataARB) (GLenum target, 
GLintptrARB offset, GLsizeiptrARB size, GLvoid * data);
-extern void (APIENTRY * qglGetBufferParameterivARB) (GLenum target, GLenum 
pname, GLint * params);
-extern void (APIENTRY * qglGetBufferPointervARB) (GLenum target, GLenum 
pname, GLvoid * *params);
-
-// GL_ARB_shader_objects
-extern void (APIENTRY * qglDeleteObjectARB) (GLhandleARB obj);
-extern  GLhandleARB(APIENTRY * qglGetHandleARB) (GLenum pname);
-extern void (APIENTRY * qglDetachObjectARB) (GLhandleARB containerObj, 
GLhandleARB attachedObj);
-extern  GLhandleARB(APIENTRY * qglCreateShaderObjectARB) (GLenum 
shaderType);
-extern void (APIENTRY * qglShaderSourceARB) (GLhandleARB shaderObj, 
GLsizei count, const GLcharARB * *string,
-   
 const GLint * length);
-extern void (APIENTRY * qglCompileShaderARB) (GLhandleARB shaderObj);
-extern  GLhandleARB(APIENTRY * qglCreateProgramObjectARB) (void);
-extern void (APIENTRY * qglAttachObjectARB) (GLhandleARB containerObj, 
GLhandleARB obj);
-extern void (APIENTRY * qglLinkProgramARB) (GLhandleARB programObj);
-extern void (APIENTRY * qglUseProgramObjectARB) (GLhandleARB programObj);
-extern void (APIENTRY * qglValidateProgramARB) (GLhandleARB programObj);
-extern void (APIENTRY * qglUniform1fARB) (GLint location, GLfloat v0);
-extern void (APIENTRY * qglUniform2fARB) (GLint location, GLfloat v0, 
GLfloat v1);
-extern void (APIENTRY * qglUniform3fARB) (GLint location, GLfloat v0, 
GLfloat v1, GLfloat v2);
-extern void (APIENTRY * qglUniform4fARB) (GLint location, GLfloat v0, 
GLfloat v1, GLfloat v2, GLfloat v3);
-extern void (APIENTRY * qglUniform1iARB) (GLint location, GLint 

[ioquake3] 03/59: Make using Yacc optional, disabled by default

[Simon McVittie]

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

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

commit 0ad4381a1185ed9ee964fbb8807eff66e8fe495d
Author: Zack Middleton 
Date:   Wed Jun 15 12:17:58 2016 -0500

Make using Yacc optional, disabled by default

A built-in GNU Make rule causes code/tools/lcc/lburg/gram.y to replace
gram.c if gram.y has a newer modified time. This causes git diff to
pick up changes to gram.c, which seems to have been manually modified
to fix warnings and may vary by Yacc used to create it. It also
requires installing a program to generate a file that already exists
in a usable state in the code repository.

So replace the built-in rule so it is only used if USE_YACC is 1
(defaults to 0). The Yacc executable name can be overriden using
`make YACC=yacc` like before.

I preferred to touch gram.c instead of installing Yacc because of the
problems it causes. It doesn't really seem like a good idea to recommend
others do that instead of disabling Yacc the Makefile though.
---
 Makefile  | 20 
 README.md |  1 +
 2 files changed, 21 insertions(+)

diff --git a/Makefile b/Makefile
index 1203517..fb7efd0 100644
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,10 @@ ifndef USE_RENDERER_DLOPEN
 USE_RENDERER_DLOPEN=1
 endif
 
+ifndef USE_YACC
+USE_YACC=0
+endif
+
 ifndef DEBUG_CFLAGS
 DEBUG_CFLAGS=-ggdb -O0
 endif
@@ -1351,6 +1355,10 @@ ifndef TOOLS_CC
   TOOLS_CC = gcc
 endif
 
+ifndef YACC
+  YACC = yacc
+endif
+
 TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing
 TOOLS_CFLAGS += $(TOOLS_OPTIMIZE) \
 -DTEMPDIR=\"$(TEMPDIR)\" -DSYSTEM=\"\" \
@@ -1363,6 +1371,12 @@ ifeq ($(GENERATE_DEPENDENCIES),1)
   TOOLS_CFLAGS += -MMD
 endif
 
+define DO_YACC
+$(echo_cmd) "YACC $<"
+$(Q)$(YACC) $<
+$(Q)mv -f y.tab.c $@
+endef
+
 define DO_TOOLS_CC
 $(echo_cmd) "TOOLS_CC $<"
 $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) -o $@ -c $<
@@ -1384,6 +1398,12 @@ LBURGOBJ= \
   $(B)/tools/lburg/lburg.o \
   $(B)/tools/lburg/gram.o
 
+# override GNU Make built-in rule for converting gram.y to gram.c
+%.c: %.y
+ifeq ($(USE_YACC),1)
+   $(DO_YACC)
+endif
+
 $(B)/tools/lburg/%.o: $(LBURGDIR)/%.c
$(DO_TOOLS_CC)
 
diff --git a/README.md b/README.md
index a5dacc9..3e004ad 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ Makefile.local:
   SERVERBIN- rename 'ioq3ded' server binary
   CLIENTBIN- rename 'ioquake3' client binary
   USE_RENDERER_DLOPEN  - build and use the renderer in a library
+  USE_YACC - use yacc to update code/tools/lcc/lburg/gram.c
   BASEGAME - rename 'baseq3'
   BASEGAME_CFLAGS  - custom CFLAGS for basegame
   MISSIONPACK  - rename 'missionpack'

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] annotated tag debian/1.42d+dfsg1-4 created (now 596a978)

[Simon McVittie]

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

smcv pushed a change to annotated tag debian/1.42d+dfsg1-4
in repository iortcw.

at  596a978   (tag)
   tagging  757e70c8b56028847b13139d5a6ad80d47b6457e (commit)
  replaces  debian/1.42d+dfsg1-3
 tagged by  Simon McVittie
on  Wed Sep 21 20:43:10 2016 +0100

- Log -
iortcw Debian release 1.42d+dfsg1-4
-BEGIN PGP SIGNATURE-

iQIcBAABCAAGBQJX4uLOAAoJEE3o/ypjx8yQiOoQAJR5kczP2wLLK/gy3GdOqMWS
XxMXlaGPz8C7J9OvZA1aoW5UgkKBN/vY+Ip9WASC0TI+6vv1+7I7Z8KsEadmmOqd
jyXGGIuNSxpEITI4XhGeqfxuQA8fACi9clOzAuVBC8IO1T68bQM+nUBE9yrNwrit
/PafwectL2ZUXYB3PSJ7XQSwyewLvc+Pqvl6dJL11Q6owyKdVl8P6ilziBqGFZxF
hC1bnxiwd0cbztAEOpNUlGN57kx3iL6k0SNftk5DtTvg/OYeRn7bU0zQLiTU4Q7Y
00Ia3JpgnARcNatl3gZ0o69EEFpzxcyz5bdu9i+McPXKCfkYmd/15D4xAclRFlxz
tpBWurnyQLqRgrO4u6S7rIdl/QbHyRIti92rAYQyRGoCMlGcbw9CBVwT9UJlRgHV
wJ8xeMAY+ad7CGfNLt9dnIGblxpPlYEQu3QZuF57lYHqaQd7NkHZYYOXGc/gY/tO
stQ0oAfr+ArJAXAbkICRQrrkk91jo+KVs2iJblFf1PrW34mYD4jNzLbG3ad8iu2f
GCzYT/Aq1Ae4AbDCTxPDAC+RSA72Z31X8YlXmV4cffGQKHawi4PM6/YRt5bqZ27F
DYbZjyPg78ZpN+08X9rGA4gz0IemMDPN96v86/N0dwRoViYc0MtRdkC1p84iJVkN
D12Amm7UOVPE5KCObpt2
=d26Y
-END PGP SIGNATURE-

Simon McVittie (7):
  Normalize packaging via wrap-and-sort -abst
  debian/gbp.conf: use DEP-14 branch names debian/master, upstream/latest
  Remove rtcw-dbg binary package and rely on automatic dbgsym packages
  debian/rules: improve get-orig-source target
  Bump debhelper compat level to 10
  debian/rules: align with ioquake3's (cosmetic changes only)
  1.42d+dfsg1-4

---

This annotated tag includes the following new commits:

   new  ae859a9   debian/gbp.conf: use DEP-14 branch names debian/master, 
upstream/latest
   new  04bb1fd   Remove rtcw-dbg binary package and rely on automatic 
dbgsym packages
   new  79bc79c   debian/rules: improve get-orig-source target
   new  bfe1c33   Bump debhelper compat level to 10
   new  f8b159f   debian/rules: align with ioquake3's (cosmetic changes 
only)
   new  757e70c   1.42d+dfsg1-4

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 496/497: MP: Fix displaying HUD in limbo menu when using cg_fixedAspect 2 (wide)

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 9116dadb936cf4eb1c0be9d26931138fdc64d994
Author: MAN-AT-ARMS 
Date:   Fri Dec 25 17:14:03 2015 -0500

MP: Fix displaying HUD in limbo menu when using cg_fixedAspect 2 (wide)
---
 MP/code/cgame/cg_draw.c| 28 ++--
 MP/code/cgame/cg_newdraw.c | 10 +-
 MP/code/cgame/cg_weapons.c |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 17fce9c..15c9768 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -865,7 +865,7 @@ static void CG_DrawUpperRight(stereoFrame_t stereoFrame) {
 
y = 0; // JPW NERVE move team overlay below obits, even with timer on 
left
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP);
}
 
@@ -919,7 +919,7 @@ static void CG_DrawTeamInfo( void ) {
return; // disabled
}
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement( PLACE_LEFT, PLACE_BOTTOM );
}
 
@@ -954,7 +954,7 @@ static void CG_DrawTeamInfo( void ) {
hcolor[3] = 0.33f * alphapercent;
 
trap_R_SetColor( hcolor );
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_DrawPic( CHATLOC_X, CHATLOC_Y - ( 
cgs.teamChatPos - i ) * TINYCHAR_HEIGHT, cgs.glconfig.vidWidth, 
TINYCHAR_HEIGHT, cgs.media.teamStatusBar );
} else {
CG_DrawPic( CHATLOC_X, CHATLOC_Y - ( 
cgs.teamChatPos - i ) * TINYCHAR_HEIGHT, 640, TINYCHAR_HEIGHT, 
cgs.media.teamStatusBar );
@@ -985,7 +985,7 @@ static void CG_DrawPickupItem( void ) {
float color[4];
const char *s;
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_LEFT, PLACE_BOTTOM);
}
 
@@ -1039,7 +1039,7 @@ static void CG_DrawNotify( void ) {
char var[MAX_TOKEN_CHARS];
float notifytime = 1.0f;
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP);
}
 
@@ -1181,7 +1181,7 @@ static void CG_DrawDisconnect( void ) {
return;
}
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM);
}
 
@@ -1213,7 +1213,7 @@ static void CG_DrawLagometer( void ) {
return;
}
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM);
}
 
@@ -2332,7 +2332,7 @@ CG_DrawSpectator
 =
 */
 static void CG_DrawSpectator( void ) {
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM);
}
 
@@ -2356,7 +2356,7 @@ static void CG_DrawVote( void ) {
float color[4] = { 1, 1, 0, 1 };
int sec;
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_LEFT, PLACE_CENTER);
}
 
@@ -2635,7 +2635,7 @@ static qboolean CG_DrawFollow( void ) {
return qfalse;
}
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP);
}
 
@@ -2692,7 +2692,7 @@ static void CG_DrawWarmup( void ) {
return; // (SA) don't bother with this stuff in sp
}
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_CENTER, PLACE_TOP);
}
 
@@ -3250,7 +3250,7 @@ void CG_DrawObjectiveIcons( void ) {
vec4_t hcolor = { 0.2f, 0.2f, 0.2f, 1.f };
int msec, mins, seconds, tens; // JPW NERVE
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {
CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP);
}
 
@@ -3508,7 +3508,7 @@ void CG_Draw2D2( void ) {
hcolor[3] = cg_hudAlpha.value;
trap_R_SetColor( hcolor );
 
-   if ( cg_fixedAspect.integer == 2 ) {
+   if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) {

[iortcw] 494/497: Fix some minor markdown issues in README

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit c1e01014f6327e5fffd0aa5593736da0aa12b584
Author: MAN-AT-ARMS 
Date:   Thu Dec 24 18:34:46 2015 -0500

Fix some minor markdown issues in README
---
 README.md | 56 
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index d78b46e..1ee191e 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,7 @@ Some of the major features currently implemented are:
   * PNG support
   * Many, many bug fixes
 
-The map editor and associated compiling tools are not included. We suggest you
-use a modern copy from http://icculus.org/gtkradiant/.
+The map editor and associated compiling tools are not included. We suggest you 
use a modern copy from http://icculus.org/gtkradiant/.
 
 The original id software readme that accompanied the RTCW source release is 
named README.txt and is contained within the source tree of both MP and SP 
games.
 
@@ -105,7 +104,6 @@ The defaults for these variables differ depending on the 
target platform.
  New cvars
 * cg_fixedAspect ( 0 ) - Use aspect corrected FOV/HUD/UI ( 0 = Off, 1 = 4:3 
style, 2 = Widescreen style )
 
-
 * cl_autoRecordDemo ( 0 ) - record a new demo on each map change
 * cl_aviFrameRate ( 25 )- the framerate to use when capturing video
 * cl_aviMotionJpeg ( 1 ) - use the mjpeg codec when capturing video
@@ -115,11 +113,9 @@ The defaults for these variables differ depending on the 
target platform.
 * cl_mouseAccelStyle ( 0 )- Set to 1 for QuakeLive mouse acceleration 
behaviour, 0 for standard
 * cl_mouseAccelOffset ( 5 ) - Tuning the acceleration curve, see below
 
-
 * in_availableJoysticks - list of available Joysticks
 * in_keyboardDebug - print keyboard debug info
  
- 
 * j_forward - Joystick analogue to m_forward, for forward movement 
speed/direction.
 * j_side - Joystick analogue to m_side, for side movement speed/direction.
 * j_up - Joystick up movement speed/direction.
@@ -131,7 +127,6 @@ The defaults for these variables differ depending on the 
target platform.
 * j_pitch_axis - Selects which joystick axis controls pitch.
 * j_yaw_axis - Selects which joystick axis controls yaw.
 
-
 * s_useOpenAL ( 1 ) - use the OpenAL sound backend if available
 * s_alPrecache ( 1 ) - cache OpenAL sounds before use
 * s_alGain ( 1.0 ) - the value of AL_GAIN for each source
@@ -148,7 +143,6 @@ The defaults for these variables differ depending on the 
target platform.
 * s_alInputDevice - which OpenAL input device to use
 * s_alAvailableInputDevices - list of available OpenAL input devices
 
-
 * s_sdlBits - SDL bit resolution
 * s_sdlSpeed - SDL sample rate
 * s_sdlChannels - SDL number of channels
@@ -163,7 +157,6 @@ The defaults for these variables differ depending on the 
target platform.
 * sv_dlRate - bandwidth allotted to PK3 file downloads via UDP, in kbyte/s
 * sv_dlURL - the base of the HTTP or FTP site that holds custom pk3 files for 
your server
 
-
 * com_ansiColor - enable use of ANSI escape codes in the terminal
 * com_altivec - enable use of altivec on PowerPC systems
 * com_standalone (read only) - If set to 1, RTCW is running in standalone mode
@@ -180,7 +173,6 @@ The defaults for these variables differ depending on the 
target platform.
 
 * sv_banFile - Name of the file that is used for storing the server bans
 
-
 * net_ip6 - IPv6 address to bind to
 * net_port6 - port to bind to using the ipv6 address
 * net_mcast6addr - multicast address to use for scanning for IPv6 servers on 
the local network
@@ -204,9 +196,9 @@ The defaults for these variables differ depending on the 
target platform.
 * r_anaglyphMode - Enable rendering of anaglyph images
 
red-cyan glasses:1
-red-blue:2
-red-green:   3
-green-magenta:   4
+   red-blue:2
+   red-green:   3
+   green-magenta:   4
 
To swap the colors for left and right eye just add 4 to the value for 
the wanted color combination. For red-blue and red-green you probably want to 
enable r_greyscale
 
@@ -274,7 +266,7 @@ missing "test.pk3", it will attempt to download from the URL
 
4 - do not use UDP downloads
 
-8 - do not ask the client to disconnect when using HTTP/FTP
+   8 - do not ask the client to disconnect when using HTTP/FTP
 
 
 Server operators who are concerned about potential "leeching" from their HTTP 
servers from other iortcw servers can make use of the HTTP_REFERER that iortcw 
sets which is "ioQ3://{SERVER_IP}:{SERVER_PORT}". For example, Apache's 
mod_rewrite can restrict access based on HTTP_REFERER.
@@ -287,8 +279,8 @@ assuming iortcw was compiled with USE_CURL=1 (the default).
 
 * Like sv_allowDownload, cl_allowDownload also uses a bitmask value supporting 
the following flags:
1 - ENABLE
-2 - do not use 

[iortcw] 495/497: MP: Center limbo view instead of stretching when using fixed aspect

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 96df21cb1c584fe58a41d7604b4bae1bf97e25cf
Author: MAN-AT-ARMS 
Date:   Fri Dec 25 04:33:27 2015 -0500

MP: Center limbo view instead of stretching when using fixed aspect
---
 MP/code/cgame/cg_draw.c  |  2 +-
 MP/code/cgame/cg_drawtools.c | 14 --
 MP/code/cgame/cg_view.c  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 7fc2594..17fce9c 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -3882,7 +3882,7 @@ void CG_DrawActive( stereoFrame_t stereoView ) {
w = LIMBO_3D_W;
h = LIMBO_3D_H;
 
-   if ( cg_fixedAspect.integer ) { //FIXME:MAN-AT-ARMS...Use 
correct view
+   if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
}
 
diff --git a/MP/code/cgame/cg_drawtools.c b/MP/code/cgame/cg_drawtools.c
index aab0561..790461e 100644
--- a/MP/code/cgame/cg_drawtools.c
+++ b/MP/code/cgame/cg_drawtools.c
@@ -67,7 +67,7 @@ void CG_AdjustFrom640( float *x, float *y, float *w, float *h 
) {
if (cg_horizontalPlacement == PLACE_STRETCH) {
// NERVE - SMF - hack to make images display properly 
in small view / limbo mode
if ( cg.limboMenu && cg.refdef.width ) {
-   float xscale = ( ( cg.refdef.width / 
cgs.screenXScaleStretch ) / 640.f );
+   float xscale = ( ( cg.refdef.width / 
cgs.screenXScaleStretch ) / 640.0 );
 
( *x ) = ( *x ) * xscale + ( cg.refdef.x / 
cgs.screenXScaleStretch );
( *w ) *= xscale;
@@ -80,9 +80,10 @@ void CG_AdjustFrom640( float *x, float *y, float *w, float 
*h ) {
} else {
// NERVE - SMF - hack to make images display properly 
in small view / limbo mode
if ( cg.limboMenu && cg.refdef.width ) {
-   float xscale = ( ( cg.refdef.width / 
cgs.screenXScaleStretch ) / 640.f );
+   float limboxscale = ( 640.0 / 480.0 ) / ( 
(float)LIMBO_3D_W / (float)LIMBO_3D_H ); // Limbo is not quite 4:3
+   float xscale = ( ( cg.refdef.width / 
cgs.screenXScale ) / ( 640.0 * limboxscale ) );
 
-   ( *x ) = ( *x ) * xscale + ( cg.refdef.x / 
cgs.screenXScaleStretch );
+   ( *x ) = ( *x ) * xscale + ( cg.refdef.x / 
cgs.screenXScale ) - ( cgs.screenXBias / cgs.screenXScale);
( *w ) *= xscale;
}
// -NERVE - SMF
@@ -101,7 +102,7 @@ void CG_AdjustFrom640( float *x, float *y, float *w, float 
*h ) {
if (cg_verticalPlacement == PLACE_STRETCH) {
// NERVE - SMF - hack to make images display properly 
in small view / limbo mode
if ( cg.limboMenu && cg.refdef.width ) {
-   float yscale = ( ( cg.refdef.height / 
cgs.screenYScaleStretch ) / 480.f );
+   float yscale = ( ( cg.refdef.height / 
cgs.screenYScaleStretch ) / 480.0 );
 
( *y ) = ( *y ) * yscale + ( cg.refdef.y / 
cgs.screenYScaleStretch );
( *h ) *= yscale;
@@ -113,9 +114,10 @@ void CG_AdjustFrom640( float *x, float *y, float *w, float 
*h ) {
} else {
// NERVE - SMF - hack to make images display properly 
in small view / limbo mode
if ( cg.limboMenu && cg.refdef.width ) {
-   float yscale = ( ( cg.refdef.height / 
cgs.screenYScaleStretch ) / 480.f );
+   float limboyscale = ( 480.0 / 640.0 ) / ( 
(float)LIMBO_3D_H / (float)LIMBO_3D_W ); // Limbo is not quite 4:3
+   float yscale = ( ( cg.refdef.height / 
cgs.screenYScale ) / ( 480.0 * limboyscale ) );
 
-   ( *y ) = ( *y ) * yscale + ( cg.refdef.y / 
cgs.screenYScaleStretch );
+   ( *y ) = ( *y ) * yscale + ( cg.refdef.y / 
cgs.screenYScale ) - ( cgs.screenYBias / cgs.screenYScale);
( *h ) *= yscale;
}
// -NERVE - SMF
diff --git a/MP/code/cgame/cg_view.c b/MP/code/cgame/cg_view.c
index 77ab410..25d89c3 100644
--- a/MP/code/cgame/cg_view.c
+++ b/MP/code/cgame/cg_view.c
@@ -202,7 +202,7 @@ static void CG_CalcVrect( void ) {
w = LIMBO_3D_W;
h = LIMBO_3D_H;
 
-   if ( cg_fixedAspect.integer ) { //FIXME:MAN-AT-ARMS...Use 
correct view
+   if ( 

[iortcw] 493/497: Update README

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 55fd0806976b9bcd2fa6a16403b2232ad7c3b9fb
Author: MAN-AT-ARMS 
Date:   Thu Dec 24 18:24:48 2015 -0500

Update README
---
 MP/misc/wolf128.png | Bin 0 -> 3357 bytes
 README.md   | 960 
 2 files changed, 368 insertions(+), 592 deletions(-)

diff --git a/MP/misc/wolf128.png b/MP/misc/wolf128.png
new file mode 100644
index 000..a4e3d20
Binary files /dev/null and b/MP/misc/wolf128.png differ
diff --git a/README.md b/README.md
index ce8d32e..d78b46e 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,8 @@
-__
-   (_)  | |   
-_  ___  _ __| |_ _  __
-   | |/ _ \| '__| __/ __\ \ /\ / /
-   | | (_) | |  | || (__ \ V  V / 
-   |_|\___/|_|   \__\___| \_/\_/  
-   
+ ![iortcw 
logo](https://raw.githubusercontent.com/iortcw/iortcw/master/MP/misc/wolf128.png)
   

 
+## iortcw
+
 The intent of this project is to provide a baseline RTCW which may be used
 for further development and fun. 
 Some of the major features currently implemented are:
@@ -34,403 +30,297 @@ Some of the major features currently implemented are:
 The map editor and associated compiling tools are not included. We suggest you
 use a modern copy from http://icculus.org/gtkradiant/.
 
-The original id software readme that accompanied the RTCW source release has 
been
-renamed to id-readme.txt so as to prevent confusion. Please refer to the
-web-site for updated status.
+The original id software readme that accompanied the RTCW source release is 
named README.txt and is contained within the source tree of both MP and SP 
games.
 
 
-- Compilation and installation 
-
+### Compilation and installation
 
-For *nix
+# For *nix
   1. Change to the directory containing this readme.
   2. Run 'make'.
 
-For Windows,
-  1. Please refer to the excellent instructions here: 
- http://wiki.ioquake3.org/Building_ioquake3
+# For Windows,
+  1. Please refer to the HOWTO-Build.txt file contained within this repository.
 
-For Mac OS X, building a Universal Binary
-  1. Install MacOSX SDK packages from XCode.  For maximum compatibility,
- install MacOSX10.4u.sdk and MacOSX10.3.9.sdk, and MacOSX10.2.8.sdk.
-  2. Change to the directory containing this README file.
+# For Mac OS X, building a Universal Binary
+  1. Install MacOSX SDK packages from XCode.  For maximum compatibility, use 
XCode 3.2.6 on 10.6 Snow Leopard with MacOSX10.5sdk.
+  2. Change to the directory containing the game source you wish to build.
   3. Run './make-macosx-ub.sh'
-  4. Copy the resulting iowolfmp.app or iowolfsp.app in 
/build/release-darwin-ub to your
- /Applications/iortcw folder.
+  4. Copy the resulting iowolfmp.app or iowolfsp.app in 
/build/release-darwin-ub to your /Applications/iortcw folder.
 
-Installation, for *nix
+# Installation, for *nix
   1. Set the COPYDIR variable in the shell to be where you installed RTCW
  to. By default it will be /usr/local/games/wolf if you haven't set it.
- This is the path as used by the original Linux RTCW installer and 
subsequent
- point releases.
+ This is the path as used by the original Linux RTCW installer and 
subsequent point releases.
   2. Run 'make copyfiles'.
 
-It is also possible to cross compile for Windows under *nix and Cygwin using 
MinGW. Your
-distribution may have mingw32 packages available. On debian/Ubuntu, you need to
-install 'mingw-w64'. Thereafter cross compiling is simply a case running
-'PLATFORM=mingw32 ARCH=x86 make' in place of 'make'. ARCH may also be set to
-x86_64.
+It is also possible to cross compile for Windows under *nix and Cygwin using 
MinGW. Your distribution may have mingw32 packages available. You will need to 
install 'mingw-w64'.
+
+Thereafter, cross compiling is simply a case running:
+
+'PLATFORM=mingw32 ARCH=x86 make' in place of 'make'.
+
+(ARCH may also be set to x86_64.)
 
 The following variables may be set, either on the command line or in
 Makefile.local:
 
-  CFLAGS - use this for custom CFLAGS
-  V  - set to show cc command line when building
-  DEFAULT_BASEDIR- extra path to search for main and such
-  BUILD_SERVER   - build the 'iowolfmpded' server binary
-  BUILD_CLIENT   - build the 'iowolfmp' or 'iowolfsp' client binary
-  BUILD_BASEGAME - build the 'main' binaries
-  BUILD_GAME_SO  - build the game shared libraries
-  BUILD_GAME_QVM - build the game qvms
-  BUILD_STANDALONE   - build binaries suited for stand-alone games
-  SERVERBIN  - rename 

[iortcw] 488/497: All: Use 2 digit hour:minute display for last server refresh time

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit d02d965a89ff992b43d985d5ad3958bf3d333d6d
Author: MAN-AT-ARMS 
Date:   Mon Dec 21 08:11:35 2015 -0500

All: Use 2 digit hour:minute display for last server refresh time
---
 MP/code/ui/ui_main.c | 2 +-
 SP/code/ui/ui_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index 1b8fa7f..fd4c8f5 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -7881,7 +7881,7 @@ static void UI_StartServerRefresh( qboolean full ) {
 
qtime_t q;
trap_RealTime(  );
-   trap_Cvar_Set( va( "ui_lastServerRefresh_%i", ui_netSource.integer ), 
va( "%s-%i, %i at %i:%i", MonthAbbrev[q.tm_mon],q.tm_mday, 1900 + 
q.tm_year,q.tm_hour,q.tm_min ) );
+   trap_Cvar_Set( va( "ui_lastServerRefresh_%i", ui_netSource.integer ), 
va( "%s-%i, %i at %02i:%02i", MonthAbbrev[q.tm_mon],q.tm_mday, 1900 + 
q.tm_year,q.tm_hour,q.tm_min ) );
 
if ( !full ) {
UI_UpdatePendingPings();
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index bc2f702..875b4dd 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -7680,7 +7680,7 @@ static void UI_StartServerRefresh( qboolean full ) {
 
qtime_t q;
trap_RealTime(  );
-   trap_Cvar_Set( va( "ui_lastServerRefresh_%i", ui_netSource.integer ), 
va( "%s-%i, %i at %i:%i", MonthAbbrev[q.tm_mon],q.tm_mday, 1900 + 
q.tm_year,q.tm_hour,q.tm_min ) );
+   trap_Cvar_Set( va( "ui_lastServerRefresh_%i", ui_netSource.integer ), 
va( "%s-%i, %i at %02i:%02i", MonthAbbrev[q.tm_mon],q.tm_mday, 1900 + 
q.tm_year,q.tm_hour,q.tm_min ) );
 
if ( !full ) {
UI_UpdatePendingPings();

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 487/497: All: Rend2: Sync tr_image_*.c files with OpenGL1

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 9688ed7cc6222533c4de19097f8cfae479a4fe9a
Author: MAN-AT-ARMS 
Date:   Sun Dec 20 16:56:35 2015 -0500

All: Rend2: Sync tr_image_*.c files with OpenGL1
---
 MP/code/rend2/tr_image_bmp.c | 6 +-
 MP/code/rend2/tr_image_pcx.c | 6 +-
 MP/code/rend2/tr_image_png.c | 6 +-
 MP/code/rend2/tr_image_tga.c | 6 +-
 SP/code/rend2/tr_image_bmp.c | 6 +-
 SP/code/rend2/tr_image_pcx.c | 6 +-
 SP/code/rend2/tr_image_png.c | 6 +-
 SP/code/rend2/tr_image_tga.c | 6 +-
 8 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/MP/code/rend2/tr_image_bmp.c b/MP/code/rend2/tr_image_bmp.c
index c793674..7cb74c7 100644
--- a/MP/code/rend2/tr_image_bmp.c
+++ b/MP/code/rend2/tr_image_bmp.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 typedef struct
 {
diff --git a/MP/code/rend2/tr_image_pcx.c b/MP/code/rend2/tr_image_pcx.c
index 388e6d1..ae9e43b 100644
--- a/MP/code/rend2/tr_image_pcx.c
+++ b/MP/code/rend2/tr_image_pcx.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 /*
 
diff --git a/MP/code/rend2/tr_image_png.c b/MP/code/rend2/tr_image_png.c
index 16c00a3..b291d93 100644
--- a/MP/code/rend2/tr_image_png.c
+++ b/MP/code/rend2/tr_image_png.c
@@ -19,11 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 #include "../qcommon/puff.h"
 
diff --git a/MP/code/rend2/tr_image_tga.c b/MP/code/rend2/tr_image_tga.c
index 38bc37f..cab6eb3 100644
--- a/MP/code/rend2/tr_image_tga.c
+++ b/MP/code/rend2/tr_image_tga.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 /*
 
diff --git a/SP/code/rend2/tr_image_bmp.c b/SP/code/rend2/tr_image_bmp.c
index c793674..7cb74c7 100644
--- a/SP/code/rend2/tr_image_bmp.c
+++ b/SP/code/rend2/tr_image_bmp.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 typedef struct
 {
diff --git a/SP/code/rend2/tr_image_pcx.c b/SP/code/rend2/tr_image_pcx.c
index 388e6d1..ae9e43b 100644
--- a/SP/code/rend2/tr_image_pcx.c
+++ b/SP/code/rend2/tr_image_pcx.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 /*
 
diff --git a/SP/code/rend2/tr_image_png.c b/SP/code/rend2/tr_image_png.c
index 16c00a3..b291d93 100644
--- a/SP/code/rend2/tr_image_png.c
+++ b/SP/code/rend2/tr_image_png.c
@@ -19,11 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
 
 #include "../qcommon/puff.h"
 
diff --git a/SP/code/rend2/tr_image_tga.c b/SP/code/rend2/tr_image_tga.c
index 38bc37f..cab6eb3 100644
--- 

[iortcw] 492/497: All: Rend2: Increase MAX_DRAWN_PSHADOWS to 32

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 4e49ab496223ffcb7f2cc3efd9514043ebc1a5b0
Author: MAN-AT-ARMS 
Date:   Thu Dec 24 10:42:23 2015 -0500

All: Rend2: Increase MAX_DRAWN_PSHADOWS to 32
---
 MP/code/rend2/tr_local.h | 2 +-
 SP/code/rend2/tr_local.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index dadf375..7411e11 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -59,7 +59,7 @@ typedef unsigned int glIndex_t;
 #define MAX_VAOS  4096
 
 #define MAX_CALC_PSHADOWS64
-#define MAX_DRAWN_PSHADOWS16 // do not increase past 32, because bit flags 
are used on surfaces
+#define MAX_DRAWN_PSHADOWS32 // do not increase past 32, because bit flags 
are used on surfaces
 #define PSHADOW_MAP_SIZE  512
 #define CUBE_MAP_MIPS  7
 #define CUBE_MAP_SIZE  (1 << CUBE_MAP_MIPS)
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 7ef89b4..469257f 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -59,7 +59,7 @@ typedef unsigned int glIndex_t;
 #define MAX_VAOS  4096
 
 #define MAX_CALC_PSHADOWS64
-#define MAX_DRAWN_PSHADOWS16 // do not increase past 32, because bit flags 
are used on surfaces
+#define MAX_DRAWN_PSHADOWS32 // do not increase past 32, because bit flags 
are used on surfaces
 #define PSHADOW_MAP_SIZE  512
 #define CUBE_MAP_MIPS  7
 #define CUBE_MAP_SIZE  (1 << CUBE_MAP_MIPS)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 489/497: MP: Pillarbox map loading screen when using cg_fixedAspect on widescreens

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 561f1da8e03af25b975e811d18813c9e86b5078f
Author: MAN-AT-ARMS 
Date:   Tue Dec 22 08:08:02 2015 -0500

MP: Pillarbox map loading screen when using cg_fixedAspect on widescreens
---
 MP/code/cgame/cg_info.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/MP/code/cgame/cg_info.c b/MP/code/cgame/cg_info.c
index e92ba51..99b9e9a 100644
--- a/MP/code/cgame/cg_info.c
+++ b/MP/code/cgame/cg_info.c
@@ -260,6 +260,21 @@ void CG_DrawInformation( void ) {
levelshot = trap_R_RegisterShaderNoMip( 
"levelshots/unknownmap.jpg" );
}
trap_R_SetColor( NULL );
+
+   // Pillarboxes
+   if ( cg_fixedAspect.integer ) {
+   if ( cgs.glconfig.vidWidth * 480.0 > cgs.glconfig.vidHeight * 
640.0 ) {
+   vec4_t col = { 0, 0, 0, 1 };
+   float pillar = 0.5 * ( ( cgs.glconfig.vidWidth - ( 
cgs.screenXScale * 640.0 ) ) / cgs.screenXScale );
+
+   CG_SetScreenPlacement( PLACE_LEFT, PLACE_CENTER );
+   CG_FillRect( 0, 0, pillar + 1, 480, col );
+   CG_SetScreenPlacement( PLACE_RIGHT, PLACE_CENTER );
+   CG_FillRect( 640 - pillar, 0, pillar + 1, 480, col );
+   CG_SetScreenPlacement( PLACE_CENTER, PLACE_CENTER );
+   }
+   }
+
CG_DrawPic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, levelshot );
 
// show the server motd

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 490/497: All: Fix error handling in RE_SaveJPGToBuffer()

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 9ef70a231d33ec7ee75a559db86814bb74f527d5
Author: MAN-AT-ARMS 
Date:   Tue Dec 22 08:19:40 2015 -0500

All: Fix error handling in RE_SaveJPGToBuffer()
---
 MP/code/rend2/tr_image_jpg.c| 20 
 MP/code/renderer/tr_image_jpg.c | 20 
 SP/code/rend2/tr_image_jpg.c| 20 
 SP/code/renderer/tr_image_jpg.c | 20 
 4 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/MP/code/rend2/tr_image_jpg.c b/MP/code/rend2/tr_image_jpg.c
index 0173d9e..5902b57 100644
--- a/MP/code/rend2/tr_image_jpg.c
+++ b/MP/code/rend2/tr_image_jpg.c
@@ -61,7 +61,7 @@ static void R_JPGErrorExit(j_common_ptr cinfo)
   
   (*cinfo->err->format_message) (cinfo, buffer);
 
-  ri.Printf(PRINT_ALL, "R_LoadJPG() error: %s", buffer);
+  ri.Printf(PRINT_ALL, "Error: %s", buffer);
 
   /* Return control to the setjmp point */
   longjmp(jerr->setjmp_buffer, 1);
@@ -142,7 +142,7 @@ void R_LoadJPG(const char *filename, unsigned char **pic, 
int *width, int *heigh
 ri.FS_FreeFile(fbuffer.v);
 
 /* Append the filename to the error for easier debugging */
-ri.Printf(PRINT_ALL, ", file %s\n", filename);
+ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
 return;
   }
 
@@ -388,17 +388,29 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, 
int quality,
 int image_width, int image_height, byte *image_buffer, int padding)
 {
   struct jpeg_compress_struct cinfo;
-  struct jpeg_error_mgr jerr;
+  q_jpeg_error_mgr_t jerr;
   JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
   my_dest_ptr dest;
   int row_stride;  /* physical row width in image buffer */
   size_t outcount;
 
   /* Step 1: allocate and initialize JPEG compression object */
-  cinfo.err = jpeg_std_error();
+  cinfo.err = jpeg_std_error();
   cinfo.err->error_exit = R_JPGErrorExit;
   cinfo.err->output_message = R_JPGOutputMessage;
 
+  /* Establish the setjmp return context for R_JPGErrorExit to use. */
+  if (setjmp(jerr.setjmp_buffer))
+  {
+/* If we get here, the JPEG code has signaled an error.
+ * We need to clean up the JPEG object and return.
+ */
+jpeg_destroy_compress();
+
+ri.Printf(PRINT_ALL, "\n");
+return 0;
+  }
+
   /* Now we can initialize the JPEG compression object. */
   jpeg_create_compress();
 
diff --git a/MP/code/renderer/tr_image_jpg.c b/MP/code/renderer/tr_image_jpg.c
index 0173d9e..5902b57 100644
--- a/MP/code/renderer/tr_image_jpg.c
+++ b/MP/code/renderer/tr_image_jpg.c
@@ -61,7 +61,7 @@ static void R_JPGErrorExit(j_common_ptr cinfo)
   
   (*cinfo->err->format_message) (cinfo, buffer);
 
-  ri.Printf(PRINT_ALL, "R_LoadJPG() error: %s", buffer);
+  ri.Printf(PRINT_ALL, "Error: %s", buffer);
 
   /* Return control to the setjmp point */
   longjmp(jerr->setjmp_buffer, 1);
@@ -142,7 +142,7 @@ void R_LoadJPG(const char *filename, unsigned char **pic, 
int *width, int *heigh
 ri.FS_FreeFile(fbuffer.v);
 
 /* Append the filename to the error for easier debugging */
-ri.Printf(PRINT_ALL, ", file %s\n", filename);
+ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
 return;
   }
 
@@ -388,17 +388,29 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, 
int quality,
 int image_width, int image_height, byte *image_buffer, int padding)
 {
   struct jpeg_compress_struct cinfo;
-  struct jpeg_error_mgr jerr;
+  q_jpeg_error_mgr_t jerr;
   JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
   my_dest_ptr dest;
   int row_stride;  /* physical row width in image buffer */
   size_t outcount;
 
   /* Step 1: allocate and initialize JPEG compression object */
-  cinfo.err = jpeg_std_error();
+  cinfo.err = jpeg_std_error();
   cinfo.err->error_exit = R_JPGErrorExit;
   cinfo.err->output_message = R_JPGOutputMessage;
 
+  /* Establish the setjmp return context for R_JPGErrorExit to use. */
+  if (setjmp(jerr.setjmp_buffer))
+  {
+/* If we get here, the JPEG code has signaled an error.
+ * We need to clean up the JPEG object and return.
+ */
+jpeg_destroy_compress();
+
+ri.Printf(PRINT_ALL, "\n");
+return 0;
+  }
+
   /* Now we can initialize the JPEG compression object. */
   jpeg_create_compress();
 
diff --git a/SP/code/rend2/tr_image_jpg.c b/SP/code/rend2/tr_image_jpg.c
index 0173d9e..5902b57 100644
--- a/SP/code/rend2/tr_image_jpg.c
+++ b/SP/code/rend2/tr_image_jpg.c
@@ -61,7 +61,7 @@ static void R_JPGErrorExit(j_common_ptr cinfo)
   
   (*cinfo->err->format_message) (cinfo, buffer);
 
-  ri.Printf(PRINT_ALL, "R_LoadJPG() error: %s", buffer);
+  ri.Printf(PRINT_ALL, "Error: %s", buffer);
 
   /* Return control to the setjmp point */
   longjmp(jerr->setjmp_buffer, 1);
@@ -142,7 +142,7 @@ void R_LoadJPG(const char *filename, unsigned char **pic, 
int *width, int 

[iortcw] 476/497: All: Fix scaling for cinematics when using cg_fixedAspect

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 7529771cf7f8c31d154ea1953571589903fd60f5
Author: MAN-AT-ARMS 
Date:   Sat Dec 12 18:05:26 2015 -0500

All: Fix scaling for cinematics when using cg_fixedAspect
---
 MP/code/ui/ui_main.c |  67 +++--
 SP/code/ui/ui_main.c | 119 ---
 2 files changed, 166 insertions(+), 20 deletions(-)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index c1add3e..1b8fa7f 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -1600,8 +1600,25 @@ static void UI_DrawClanCinematic( rectDef_t *rect, float 
scale, vec4_t color ) {
}
if ( uiInfo.teamList[i].cinematic >= 0 ) {
trap_CIN_RunCinematic( 
uiInfo.teamList[i].cinematic );
-   //FIXME:MAN-AT-ARMS Scale this
-   trap_CIN_SetExtents( 
uiInfo.teamList[i].cinematic, rect->x, rect->y, rect->w, rect->h );
+
+   if ( ui_fixedAspect.integer ) {
+   if ( DC->glconfig.vidWidth * 480.0 > 
DC->glconfig.vidHeight * 640.0 ) {
+   float scaledx = rect->x * ( 
480.0 / 640.0 ) + ( DC->xBias / DC->xscaleStretch); 
+   float scaledw = rect->w * ( 
480.0 / 640.0 );
+
+   trap_CIN_SetExtents( 
uiInfo.teamList[i].cinematic, scaledx, rect->y, scaledw, rect->h );
+   } else if ( DC->glconfig.vidWidth * 
480.0 < DC->glconfig.vidHeight * 640.0 ) {
+   float scaledy = rect->y * ( 
480.0 / 640.0 ) + ( DC->yBias / DC->yscaleStretch);
+   float scaledh = rect->h * ( 
480.0 / 640.0 );
+
+   trap_CIN_SetExtents( 
uiInfo.teamList[i].cinematic, rect->x, scaledy, rect->w, scaledh );
+   } else {
+   trap_CIN_SetExtents( 
uiInfo.teamList[i].cinematic, rect->x, rect->y, rect->w, rect->h );
+   }
+   } else {
+   trap_CIN_SetExtents( 
uiInfo.teamList[i].cinematic, rect->x, rect->y, rect->w, rect->h );
+   }
+
trap_CIN_DrawCinematic( 
uiInfo.teamList[i].cinematic );
} else {
uiInfo.teamList[i].cinematic = -2;
@@ -1620,8 +1637,25 @@ static void UI_DrawPreviewCinematic( rectDef_t *rect, 
float scale, vec4_t color
uiInfo.previewMovie = trap_CIN_PlayCinematic( va( "%s.roq", 
uiInfo.movieList[uiInfo.movieIndex] ), 0, 0, 0, 0, ( CIN_loop | CIN_silent ) );
if ( uiInfo.previewMovie >= 0 ) {
trap_CIN_RunCinematic( uiInfo.previewMovie );
-   //FIXME:MAN-AT-ARMS Scale this
-   trap_CIN_SetExtents( uiInfo.previewMovie, rect->x, 
rect->y, rect->w, rect->h );
+
+   if ( ui_fixedAspect.integer ) {
+   if ( DC->glconfig.vidWidth * 480.0 > 
DC->glconfig.vidHeight * 640.0 ) {
+   float scaledx = rect->x * ( 480.0 / 
640.0 ) + ( DC->xBias / DC->xscaleStretch); 
+   float scaledw = rect->w * ( 480.0 / 
640.0 );
+
+   trap_CIN_SetExtents( 
uiInfo.previewMovie, scaledx, rect->y, scaledw, rect->h );
+   } else if ( DC->glconfig.vidWidth * 480.0 < 
DC->glconfig.vidHeight * 640.0 ) {
+   float scaledy = rect->y * ( 480.0 / 
640.0 ) + ( DC->yBias / DC->yscaleStretch);
+   float scaledh = rect->h * ( 480.0 / 
640.0 );
+
+   trap_CIN_SetExtents( 
uiInfo.previewMovie, rect->x, scaledy, rect->w, scaledh );
+   } else {
+   trap_CIN_SetExtents( 
uiInfo.previewMovie, rect->x, rect->y, rect->w, rect->h );
+   }
+   } else {
+   trap_CIN_SetExtents( uiInfo.previewMovie, 
rect->x, rect->y, rect->w, rect->h );
+   }
+
trap_CIN_DrawCinematic( uiInfo.previewMovie );
} else {
uiInfo.previewMovie = -2;
@@ -1749,15 +1783,16 @@ static void UI_DrawMapCinematic( rectDef_t *rect, float 
scale, vec4_t color, qbo
trap_CIN_RunCinematic( uiInfo.mapList[map].cinematic );
 
if ( 

[iortcw] 484/497: SP: Fix loading start and end cutscene autosaves (Broken in 2e3c5fd)

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 7b8e2c1b93ea9d4069f1c5f568bfc64d38283cb4
Author: MAN-AT-ARMS 
Date:   Sat Dec 19 11:17:41 2015 -0500

SP: Fix loading start and end cutscene autosaves (Broken in 2e3c5fd)
---
 SP/code/game/g_save.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SP/code/game/g_save.c b/SP/code/game/g_save.c
index f7fa94c..5d29aad 100644
--- a/SP/code/game/g_save.c
+++ b/SP/code/game/g_save.c
@@ -1514,7 +1514,8 @@ void G_LoadGame( char *filename ) {
// reset all AAS blocking entities
trap_AAS_SetAASBlockingEntity( vec3_origin, vec3_origin, -1 );
 
-   if ( Q_stricmpn( mapstr, "cutscene", 8 ) ) { // Don't read in this 
stuff for cutscenes
+   // Don't read in this stuff for mid-game cutscenes
+   if ( !( !Q_stricmpn( mapstr, "cutscene6", 9 ) || !Q_stricmpn( mapstr, 
"cutscene9", 9 ) || !Q_stricmpn( mapstr, "cutscene11", 10 ) || !Q_stricmpn( 
mapstr, "cutscene14", 10 ) ) ) {
// read the entity structures
trap_FS_Read( , sizeof( i ), f );
size = i;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 482/497: All: Fix some compiler warnings

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit a75866ff1e79f8f713bb7160aba03e2d3b56fa16
Author: MAN-AT-ARMS 
Date:   Thu Dec 17 19:19:12 2015 -0500

All: Fix some compiler warnings
---
 MP/code/game/g_mover.c |  8 
 SP/code/game/g_mover.c | 13 +++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/MP/code/game/g_mover.c b/MP/code/game/g_mover.c
index 86ee003..d7f20ca 100644
--- a/MP/code/game/g_mover.c
+++ b/MP/code/game/g_mover.c
@@ -3067,7 +3067,7 @@ radius = maximum distance from center of entity to place 
each bat (default=32)
 speed = speed to travel to next waypoint (default=300)
 */
 void FuncBatsReached( gentity_t *self ) {
-   if ( self->active == 2 ) {
+   if ( !self->active ) {
self->nextthink = -1;
self->think = 0;
return;
@@ -3080,7 +3080,7 @@ void FuncBatsReached( gentity_t *self ) {
self->r.contents = 0;
 
if ( !self->nextTrain || !self->nextTrain->target ) {
-   self->active = 2;   // remove the bats at next point
+   self->active = qfalse;   // remove the bats at next point
return;
}
 }
@@ -3094,7 +3094,7 @@ void BatMoveThink( gentity_t *bat ) {
trace_t tr;
 
owner = _entities[bat->r.ownerNum];
-   if ( owner->active == qtrue ) { // move towards the owner
+   if ( owner->active == qtrue && owner->inuse ) { // move towards the 
owner
BG_EvaluateTrajectory( >s.pos, level.time, goalpos );
 
// randomize ther movedir as we go
@@ -3127,7 +3127,7 @@ void BatMoveThink( gentity_t *bat ) {
}
}
 
-   } else if ( owner->active == 2 ) {
+   } else if ( owner->active || !owner->inuse ) {
// owner has finished
G_FreeEntity( bat );
return;
diff --git a/SP/code/game/g_mover.c b/SP/code/game/g_mover.c
index a3a3055..143006e 100644
--- a/SP/code/game/g_mover.c
+++ b/SP/code/game/g_mover.c
@@ -3084,7 +3084,7 @@ target = (used for end map) distance check from this 
entity to enable spawning i
 delay = (end map) wait in seconds this long after player steps outside, before 
spawning spirits
 */
 void FuncBatsReached( gentity_t *self ) {
-   if ( self->active == 2 ) {
+   if ( !self->active ) {
self->nextthink = -1;
self->think = 0;
return;
@@ -3097,16 +3097,9 @@ void FuncBatsReached( gentity_t *self ) {
self->r.contents = 0;
 
if ( !self->nextTrain || !self->nextTrain->target ) {
-   self->active = 2;   // remove the bats at next point
+   self->active = qfalse;   // remove the bats at next point
return;
}
-
-// if(self->nextTrain) {
-// if(Q_stricmp(self->nextTrain->classname, "path_corner")) {
-// self->active = 2;
-// return;
-// }
-// }
 }
 
 // each bat calls this every server frame, so it moves towards it's ideal 
position
@@ -3154,7 +3147,7 @@ void BatMoveThink( gentity_t *bat ) {
}
}
 */
-   } else if ( owner->active == 2 || !owner->inuse ) {
+   } else if ( owner->active || !owner->inuse ) {
// owner has finished
G_FreeEntity( bat );
return;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 486/497: All: Make jpeg loading errors non-fatal

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit fd56996481cc915a14f6bfb114b1cac96cc01d66
Author: MAN-AT-ARMS 
Date:   Sun Dec 20 16:02:52 2015 -0500

All: Make jpeg loading errors non-fatal
---
 MP/code/rend2/tr_image_jpg.c| 49 ++---
 MP/code/renderer/tr_image_jpg.c | 43 +---
 SP/code/rend2/tr_image_jpg.c| 49 ++---
 SP/code/renderer/tr_image_jpg.c | 43 +---
 4 files changed, 142 insertions(+), 42 deletions(-)

diff --git a/MP/code/rend2/tr_image_jpg.c b/MP/code/rend2/tr_image_jpg.c
index abe5e65..0173d9e 100644
--- a/MP/code/rend2/tr_image_jpg.c
+++ b/MP/code/rend2/tr_image_jpg.c
@@ -20,11 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include 
+
+#include "tr_local.h"
 
 /*
  * Include file for users of JPEG library.
@@ -46,16 +44,27 @@ extern  refimport_t ri;
 #  endif
 #endif
 
-static void __attribute__((__noreturn__)) R_JPGErrorExit(j_common_ptr cinfo)
+/* Catching errors, as done in libjpeg's example.c */
+typedef struct q_jpeg_error_mgr_s
+{
+  struct jpeg_error_mgr pub;  /* "public" fields */
+
+  jmp_buf setjmp_buffer;  /* for return to caller */
+} q_jpeg_error_mgr_t;
+
+static void R_JPGErrorExit(j_common_ptr cinfo)
 {
   char buffer[JMSG_LENGTH_MAX];
+
+  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce 
pointer */
+  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
   
   (*cinfo->err->format_message) (cinfo, buffer);
-  
-  /* Let the memory manager delete any temp files before we die */
-  jpeg_destroy(cinfo);
-  
-  ri.Error(ERR_FATAL, "%s", buffer);
+
+  ri.Printf(PRINT_ALL, "R_LoadJPG() error: %s", buffer);
+
+  /* Return control to the setjmp point */
+  longjmp(jerr->setjmp_buffer, 1);
 }
 
 static void R_JPGOutputMessage(j_common_ptr cinfo)
@@ -87,7 +96,7 @@ void R_LoadJPG(const char *filename, unsigned char **pic, int 
*width, int *heigh
* Note that this struct must live as long as the main JPEG parameter
* struct, to avoid dangling-pointer problems.
*/
-  struct jpeg_error_mgr jerr;
+  q_jpeg_error_mgr_t jerr;
   /* More stuff */
   JSAMPARRAY buffer;   /* Output row buffer */
   unsigned int row_stride; /* physical row width in output buffer */
@@ -119,10 +128,24 @@ void R_LoadJPG(const char *filename, unsigned char **pic, 
int *width, int *heigh
* This routine fills in the contents of struct jerr, and returns jerr's
* address which we place into the link field in cinfo.
*/
-  cinfo.err = jpeg_std_error();
+  cinfo.err = jpeg_std_error();
   cinfo.err->error_exit = R_JPGErrorExit;
   cinfo.err->output_message = R_JPGOutputMessage;
 
+  /* Establish the setjmp return context for R_JPGErrorExit to use. */
+  if (setjmp(jerr.setjmp_buffer))
+  {
+/* If we get here, the JPEG code has signaled an error.
+ * We need to clean up the JPEG object, close the input file, and return.
+ */
+jpeg_destroy_decompress();
+ri.FS_FreeFile(fbuffer.v);
+
+/* Append the filename to the error for easier debugging */
+ri.Printf(PRINT_ALL, ", file %s\n", filename);
+return;
+  }
+
   /* Now we can initialize the JPEG decompression object. */
   jpeg_create_decompress();
 
diff --git a/MP/code/renderer/tr_image_jpg.c b/MP/code/renderer/tr_image_jpg.c
index b16b3df..0173d9e 100644
--- a/MP/code/renderer/tr_image_jpg.c
+++ b/MP/code/renderer/tr_image_jpg.c
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 ===
 */
 
+#include 
+
 #include "tr_local.h"
 
 /*
@@ -42,16 +44,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 #  endif
 #endif
 
-static void __attribute__((__noreturn__)) R_JPGErrorExit(j_common_ptr cinfo)
+/* Catching errors, as done in libjpeg's example.c */
+typedef struct q_jpeg_error_mgr_s
+{
+  struct jpeg_error_mgr pub;  /* "public" fields */
+
+  jmp_buf setjmp_buffer;  /* for return to caller */
+} q_jpeg_error_mgr_t;
+
+static void R_JPGErrorExit(j_common_ptr cinfo)
 {
   char buffer[JMSG_LENGTH_MAX];
+
+  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce 
pointer */
+  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
   
   (*cinfo->err->format_message) (cinfo, buffer);
-  
-  /* Let the memory manager delete any temp files before we die */
-  jpeg_destroy(cinfo);
-  
-  ri.Error(ERR_FATAL, "%s", buffer);
+
+  ri.Printf(PRINT_ALL, "R_LoadJPG() error: 

[iortcw] 485/497: MP: Fix downloading from an update server

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 488923d0eebb77efc53598f9f40323b0b7a90bfc
Author: MAN-AT-ARMS 
Date:   Sun Dec 20 15:09:27 2015 -0500

MP: Fix downloading from an update server
---
 MP/code/client/cl_main.c   |  2 +-
 MP/code/qcommon/files.c|  2 ++
 MP/code/qcommon/qcommon.h  | 12 +++-
 MP/code/server/sv_client.c | 11 ---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 215f103..c6dea1c 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -2324,7 +2324,7 @@ void CL_NextDownload(void)
qboolean useCURL = qfalse;
 
// A download has finished, check whether this matches a referenced 
checksum
-   if(*clc.downloadName)
+   if( *clc.downloadName && !autoupdateStarted )
{
char *zippath = 
FS_BuildOSPath(Cvar_VariableString("fs_homepath"), clc.downloadName, "");
zippath[strlen(zippath)-1] = '\0';
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 02da298..71cd350 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -4204,8 +4204,10 @@ void FS_InitFilesystem( void ) {
FS_Startup(com_basegame->string);
 
 #ifndef STANDALONE
+#ifndef UPDATE_SERVER
FS_CheckPak0( );
 #endif
+#endif
 
 #ifndef UPDATE_SERVER
// if we can't find default.cfg, assume that the paths are
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
index 5b0b871..fe5fa79 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
@@ -295,14 +295,14 @@ You or the server may be running older versions of the 
game. Press the auto-upda
 // NOTE: that stuff only works with two digits protocols
 extern int demo_protocols[];
 
-#if !defined UPDATE_SERVER_NAME && !defined STANDALONE
 // NERVE - SMF - wolf multiplayer master servers
-#define UPDATE_SERVER_NAME  "wolfmotd.idsoftware.com"// 
192.246.40.65
+#if !defined UPDATE_SERVER_NAME && !defined STANDALONE
+#define UPDATE_SERVER_NAME "wolfmotd.idsoftware.com"   // 
192.246.40.65
 #endif
 
 #ifndef MASTER_SERVER_NAME
-//#define MASTER_SERVER_NAME  "wolfmaster.idsoftware.com"  // Official 
master server decommissioned
-#define MASTER_SERVER_NAME  "dpmaster.deathmask.net"
+//#define MASTER_SERVER_NAME   "wolfmaster.idsoftware.com" // 
Official master server decommissioned
+#define MASTER_SERVER_NAME "dpmaster.deathmask.net"
 #endif
 
 #ifndef STANDALONE
@@ -310,10 +310,12 @@ extern int demo_protocols[];
 #defineAUTHORIZE_SERVER_NAME   "wolfauthorize.idsoftware.com"
   #endif
   #ifndef PORT_AUTHORIZE
-  #define  PORT_AUTHORIZE  27952
+#definePORT_AUTHORIZE  27952
   #endif
 #endif
 
+//#define AUTOUPDATE_SERVER_NAME   "foobar"
+
 #if !defined AUTOUPDATE_SERVER_NAME && !defined STANDALONE
 // TTimo: allow override for easy dev/testing..
 // see cons -- update_server=myhost
diff --git a/MP/code/server/sv_client.c b/MP/code/server/sv_client.c
index e604ea6..d74de7e 100644
--- a/MP/code/server/sv_client.c
+++ b/MP/code/server/sv_client.c
@@ -958,6 +958,7 @@ int SV_WriteDownloadToClient( client_t *cl, msg_t *msg ) {
return 0;
}
 
+#ifndef UPDATE_SERVER
// CVE-2006-2082
// validate the download against the list of pak files
if ( !FS_VerifyPak( cl->downloadName ) ) {
@@ -965,6 +966,7 @@ int SV_WriteDownloadToClient( client_t *cl, msg_t *msg ) {
SV_DropClient( cl, "illegal download request" );
return 0;
}
+#endif
 
if(!cl->download)
{
@@ -1004,8 +1006,6 @@ int SV_WriteDownloadToClient( client_t *cl, msg_t *msg ) {
}
}
 
-   cl->download = 0;
-
// DHM - Nerve :: Update server only allows files that are in 
versionmap.cfg to download
 #ifdef UPDATE_SERVER
for ( i = 0; i < numVersions; i++ ) {
@@ -1034,10 +1034,15 @@ int SV_WriteDownloadToClient( client_t *cl, msg_t *msg 
) {
 #endif
// DHM - Nerve
 
+   cl->download = 0;
+
// We open the file here
if ( !(sv_allowDownload->integer & DLF_ENABLE) ||
(sv_allowDownload->integer & DLF_NO_UDP) ||
-   idPack || unreferenced ||
+   idPack ||
+#ifndef UPDATE_SERVER
+   unreferenced ||
+#endif
( cl->downloadSize = FS_SV_FOpenFileRead( 
cl->downloadName, >download ) ) < 0 ) {
// cannot auto-download file
if(unreferenced)

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

___
Pkg-games-commits mailing list

[iortcw] 480/497: All: Rend2: Switch to RGTC from LATC for normal maps Also added a RGTC compressor as a workaround on Intel graphics

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit e72efe24be0f697d93fadf2a00c29ab596b3c405
Author: MAN-AT-ARMS 
Date:   Wed Dec 16 07:39:12 2015 -0500

All: Rend2: Switch to RGTC from LATC for normal maps
Also added a RGTC compressor as a workaround on Intel graphics
---
 MP/code/rend2/qgl.h   |  12 +-
 MP/code/rend2/tr_extensions.c |  26 -
 MP/code/rend2/tr_glsl.c   |   2 +-
 MP/code/rend2/tr_image.c  | 247 +-
 MP/code/rend2/tr_local.h  |   4 +-
 MP/rend2-readme.txt   |   4 +-
 SP/code/rend2/qgl.h   |  12 +-
 SP/code/rend2/tr_extensions.c |  26 -
 SP/code/rend2/tr_glsl.c   |   2 +-
 SP/code/rend2/tr_image.c  | 247 +-
 SP/code/rend2/tr_local.h  |   4 +-
 SP/rend2-readme.txt   |   4 +-
 12 files changed, 360 insertions(+), 230 deletions(-)

diff --git a/MP/code/rend2/qgl.h b/MP/code/rend2/qgl.h
index ed7eae1..1600de7 100644
--- a/MP/code/rend2/qgl.h
+++ b/MP/code/rend2/qgl.h
@@ -755,12 +755,12 @@ extern void (APIENTRY * 
qglRenderbufferStorageMultisampleEXT)(GLenum target, GLs
 #define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9
 #endif
 
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT  0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT   0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT0x8C73
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1   0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC10x8DBC
+#define GL_COMPRESSED_RG_RGTC20x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE
 #endif
 
 #ifndef GL_ARB_texture_compression_bptc
diff --git a/MP/code/rend2/tr_extensions.c b/MP/code/rend2/tr_extensions.c
index c0f4d04..07e188c 100644
--- a/MP/code/rend2/tr_extensions.c
+++ b/MP/code/rend2/tr_extensions.c
@@ -585,6 +585,22 @@ void GLimp_InitExtraExtensions()
ri.Printf(PRINT_ALL, result[2], extension);
}
 
+   // GL_ARB_texture_compression
+   extension = "GL_ARB_texture_compression";
+   glRefConfig.arbTextureCompression = qfalse;
+   if (GLimp_HaveExtension(extension))
+   {
+   qglCompressedTexImage3DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexImage3DARB");
+   qglCompressedTexImage2DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexImage2DARB");
+   qglCompressedTexImage1DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexImage1DARB");
+   qglCompressedTexSubImage3DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexSubImage3DARB");
+   qglCompressedTexSubImage2DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexSubImage2DARB");
+   qglCompressedTexSubImage1DARB = (void 
*)SDL_GL_GetProcAddress("glCompressedTexSubImage1DARB");
+   qglGetCompressedTexImageARB = (void 
*)SDL_GL_GetProcAddress("glGetCompressedTexImageARB");
+   glRefConfig.arbTextureCompression = qtrue;
+   ri.Printf(PRINT_ALL, result[glRefConfig.arbTextureCompression], 
extension);
+   }
+
// GL_EXT_framebuffer_multisample
extension = "GL_EXT_framebuffer_multisample";
glRefConfig.framebufferMultisample = qfalse;
@@ -601,12 +617,12 @@ void GLimp_InitExtraExtensions()
 
glRefConfig.textureCompression = TCR_NONE;
 
-   // GL_EXT_texture_compression_latc
-   extension = "GL_EXT_texture_compression_latc";
+   // GL_ARB_texture_compression_rgtc
+   extension = "GL_ARB_texture_compression_rgtc";
if (GLimp_HaveExtension(extension))
{
-   if (r_ext_compressed_textures->integer)
-   glRefConfig.textureCompression |= TCR_LATC;
+   if (r_ext_compressed_textures->integer && 
glRefConfig.arbTextureCompression)
+   glRefConfig.textureCompression |= TCR_RGTC;
 
ri.Printf(PRINT_ALL, result[r_ext_compressed_textures->integer 
? 1 : 0], extension);
}
@@ -615,6 +631,8 @@ void GLimp_InitExtraExtensions()
ri.Printf(PRINT_ALL, result[2], extension);
}
 
+   glRefConfig.swizzleNormalmap = r_ext_compressed_textures->integer && 
!(glRefConfig.textureCompression & TCR_RGTC);
+
// GL_ARB_texture_compression_bptc
extension = "GL_ARB_texture_compression_bptc";
if (GLimp_HaveExtension(extension))
diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index 9d87bad..ce83a62 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -1049,7 +1049,7 @@ void GLSL_InitGPUShaders(void)
   

[iortcw] 481/497: All: Rend2: Some tr_image.c cleanup

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 703d27b46404c52f457bf49ab2dfa95e565b2829
Author: MAN-AT-ARMS 
Date:   Thu Dec 17 11:19:44 2015 -0500

All: Rend2: Some tr_image.c cleanup
---
 MP/code/rend2/tr_image.c | 299 ---
 SP/code/rend2/tr_image.c | 299 ---
 2 files changed, 154 insertions(+), 444 deletions(-)

diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index 6688a25..6b2d124 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -1612,7 +1612,7 @@ RawImage_ScaleToPower2
 
 ===
 */
-static void RawImage_ScaleToPower2( byte **data, int *inout_width, int 
*inout_height, int *inout_scaled_width, int *inout_scaled_height, imgType_t 
type, imgFlags_t flags, byte **resampledBuffer)
+static qboolean RawImage_ScaleToPower2( byte **data, int *inout_width, int 
*inout_height, imgType_t type, imgFlags_t flags, byte **resampledBuffer)
 {
int width = *inout_width;
int height =*inout_height;
@@ -1621,6 +1621,7 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
qboolean picmip = flags & IMGFLAG_PICMIP;
qboolean mipmap = flags & IMGFLAG_MIPMAP;
qboolean clampToEdge = flags & IMGFLAG_CLAMPTOEDGE;
+   qboolean notScaled;
 
//
// convert to exact power of 2 sizes
@@ -1667,22 +1668,9 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
*resampledBuffer = ri.Hunk_AllocateTempMemory( finalwidth * 
finalheight * 4 );
 
if (scaled_width != width || scaled_height != height)
-   {
ResampleTexture (*data, width, height, 
*resampledBuffer, scaled_width, scaled_height);
-   }
else
-   {
-   byte *inbyte, *outbyte;
-   int i;
-
-   inbyte = *data;
-   outbyte = *resampledBuffer;
-
-   for (i = width * height * 4; i > 0; i--)
-   {
-   *outbyte++ = *inbyte++;
-   }
-   }
+   Com_Memcpy(*resampledBuffer, *data, width * height * 4);
 
if (type == IMGTYPE_COLORALPHA)
RGBAtoYCoCgA(*resampledBuffer, *resampledBuffer, 
scaled_width, scaled_height);
@@ -1696,13 +1684,9 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
}
 
if (type == IMGTYPE_COLORALPHA)
-   {
YCoCgAtoRGBA(*resampledBuffer, *resampledBuffer, 
scaled_width, scaled_height);
-   }
else if (type == IMGTYPE_NORMAL || type == IMGTYPE_NORMALHEIGHT)
-   {
FillInNormalizedZ(*resampledBuffer, *resampledBuffer, 
scaled_width, scaled_height);
-   }
 
 
//endTime = ri.Milliseconds();
@@ -1710,20 +1694,20 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
//ri.Printf(PRINT_ALL, "upsampled %dx%d to %dx%d in %dms\n", 
width, height, scaled_width, scaled_height, endTime - startTime);
 
*data = *resampledBuffer;
-   width = scaled_width;
-   height = scaled_height;
}
-   else if ( scaled_width != width || scaled_height != height ) {
+   else if ( scaled_width != width || scaled_height != height )
+   {
if (data && resampledBuffer)
{
*resampledBuffer = ri.Hunk_AllocateTempMemory( 
scaled_width * scaled_height * 4 );
ResampleTexture (*data, width, height, 
*resampledBuffer, scaled_width, scaled_height);
*data = *resampledBuffer;
}
-   width = scaled_width;
-   height = scaled_height;
}
 
+   width  = scaled_width;
+   height = scaled_height;
+
//
// perform optional picmip operation
//
@@ -1733,16 +1717,6 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
}
 
//
-   // clamp to minimum size
-   //
-   if (scaled_width < 1) {
-   scaled_width = 1;
-   }
-   if (scaled_height < 1) {
-   scaled_height = 1;
-   }
-
-   //
// clamp to the current upper OpenGL limit
// scale both axis down equally so we don't have to
// deal with a half mip resampling
@@ -1753,10 +1727,35 @@ static void RawImage_ScaleToPower2( byte **data, int 
*inout_width, int *inout_he
scaled_height >>= 1;
}
 
-   *inout_width = width;
-   *inout_height 

[iortcw] 483/497: SP: Fix loading cutscene autosaves

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 2e3c5fd2da204ea0f8cc2e51dd95ff09a1d5ccb9
Author: MAN-AT-ARMS 
Date:   Sat Dec 19 07:37:31 2015 -0500

SP: Fix loading cutscene autosaves
---
 SP/code/game/g_save.c | 158 --
 1 file changed, 76 insertions(+), 82 deletions(-)

diff --git a/SP/code/game/g_save.c b/SP/code/game/g_save.c
index 45b150b..f7fa94c 100644
--- a/SP/code/game/g_save.c
+++ b/SP/code/game/g_save.c
@@ -1267,8 +1267,6 @@ qboolean G_SaveGame( char *username ) {
G_SaveWriteError();
}
 
-
-
// write out the entity structures
i = sizeof( gentity_t );
if ( !G_SaveWrite( , sizeof( i ), f ) ) {
@@ -1333,7 +1331,6 @@ qboolean G_SaveGame( char *username ) {
G_SaveWriteError();
}
 
-
trap_FS_FCloseFile( f );
 
// check the byte count
@@ -1374,6 +1371,7 @@ G_LoadGame
 */
 void G_LoadGame( char *filename ) {
char mapname[MAX_QPATH];
+   char mapstr[MAX_QPATH];
fileHandle_t f;
int i, leveltime, size, last;
gentity_t   *ent;
@@ -1420,6 +1418,7 @@ void G_LoadGame( char *filename ) {
 
// read the mapname (this is only used in the sever exe, so just 
discard it)
trap_FS_Read( mapname, MAX_QPATH, f );
+   Com_sprintf( mapstr, MAX_QPATH, "%s", mapname );
 
// read the level time
trap_FS_Read( , sizeof( i ), f );
@@ -1498,7 +1497,6 @@ void G_LoadGame( char *filename ) {
}
trap_Cvar_Set( "r_savegameFogColor", infoString 
);
}
-
trap_SetConfigstring( CS_FOGVARS, infoString );
}
 //(SA) end
@@ -1513,96 +1511,96 @@ void G_LoadGame( char *filename ) {
}
}
 
-
-
-
// reset all AAS blocking entities
trap_AAS_SetAASBlockingEntity( vec3_origin, vec3_origin, -1 );
 
-   // read the entity structures
-   trap_FS_Read( , sizeof( i ), f );
-   size = i;
-   last = 0;
-   while ( 1 )
-   {
+   if ( Q_stricmpn( mapstr, "cutscene", 8 ) ) { // Don't read in this 
stuff for cutscenes
+   // read the entity structures
trap_FS_Read( , sizeof( i ), f );
-   if ( i < 0 ) {
-   break;
-   }
-   if ( i >= MAX_GENTITIES ) {
-   trap_FS_FCloseFile( f );
-   G_Error( "G_LoadGame: entitynum out of range (%i, MAX = 
%i)\n", i, MAX_GENTITIES );
-   }
-   if ( i >= level.num_entities ) {  // notify server
-   level.num_entities = i;
-   serverEntityUpdate = qtrue;
-   }
-   ent = _entities[i];
-   ReadEntity( f, ent, size );
-   // free all entities that we skipped
-   for ( ; last < i; last++ ) {
-   if ( g_entities[last].inuse && i != ENTITYNUM_WORLD ) {
-   if ( last < MAX_CLIENTS ) {
-   trap_DropClient( last, "" );
-   } else {
-   G_FreeEntity( _entities[last] );
+   size = i;
+   last = 0;
+   while ( 1 )
+   {
+   trap_FS_Read( , sizeof( i ), f );
+   if ( i < 0 ) {
+   break;
+   }
+   if ( i >= MAX_GENTITIES ) {
+   trap_FS_FCloseFile( f );
+   G_Error( "G_LoadGame: entitynum out of range 
(%i, MAX = %i)\n", i, MAX_GENTITIES );
+   }
+   if ( i >= level.num_entities ) {  // notify server
+   level.num_entities = i;
+   serverEntityUpdate = qtrue;
+   }
+   ent = _entities[i];
+   ReadEntity( f, ent, size );
+   // free all entities that we skipped
+   for ( ; last < i; last++ ) {
+   if ( g_entities[last].inuse && i != 
ENTITYNUM_WORLD ) {
+   if ( last < MAX_CLIENTS ) {
+   trap_DropClient( last, "" );
+   } else {
+   G_FreeEntity( _entities[last] 
);
+   }
}
}
+   last = i + 1;
}
-   last = i + 1;
-   }
 
-   // clear all remaining entities
-   for ( ent = _entities[last] ; last < 

[iortcw] 479/497: All: Add list of iortcw command changes for reference

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 86e2453f44857ca97615eee1f55d41202eca99e0
Author: MAN-AT-ARMS 
Date:   Sun Dec 13 14:19:32 2015 -0500

All: Add list of iortcw command changes for reference
---
 iortcw-command-changes.txt | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/iortcw-command-changes.txt b/iortcw-command-changes.txt
new file mode 100644
index 000..71dc54a
--- /dev/null
+++ b/iortcw-command-changes.txt
@@ -0,0 +1,34 @@
+Added
+-
+-voiprecord
++voiprecord
+banaddr
+bandel
+cvar_modified
+exceptaddr
+exceptdel
+execq
+flushbans
+game_restart
+kickall
+kickbots
+kicknum
+listbans
+minimize
+model
+net_restart
+net_stop
+print
+rehashbans
+stopmusic
+stopvideo
+togglemenu
+unset
+video
+which
+
+Removed
+---
+buyNow
+singlePlayLink
+streamingsound

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 477/497: All: Remove unused menu item hacks

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 0d636da4751c11ab467bcfc178fcbaa21b4a8608
Author: MAN-AT-ARMS 
Date:   Sun Dec 13 05:14:38 2015 -0500

All: Remove unused menu item hacks
---
 MP/code/ui/ui_shared.c | 14 --
 SP/code/ui/ui_shared.c | 26 +-
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/MP/code/ui/ui_shared.c b/MP/code/ui/ui_shared.c
index c4cab3c..0dae2a3 100644
--- a/MP/code/ui/ui_shared.c
+++ b/MP/code/ui/ui_shared.c
@@ -5848,20 +5848,6 @@ static void Item_ApplyHacks( itemDef_t *item ) {
editField->maxChars = 48;
}
}
-
-   if ( item->type == ITEM_TYPE_EDITFIELD && item->cvar && ( !Q_stricmp( 
item->cvar, "ui_Name" ) || !Q_stricmp( item->cvar, "ui_findplayer" ) ) ) {
-   editFieldDef_t *editField = (editFieldDef_t *)item->typeData;
-
-   // enough to hold a full player name
-   if ( editField->maxChars < MAX_NAME_LENGTH ) {
-   if ( editField->maxPaintChars > editField->maxChars ) {
-   editField->maxPaintChars = editField->maxChars;
-   }
-
-   Com_Printf( "Extended player name field using cvar %s 
to %d characters\n", item->cvar, MAX_NAME_LENGTH );
-   editField->maxChars = MAX_NAME_LENGTH;
-   }
-   }
 }
 
 /*
diff --git a/SP/code/ui/ui_shared.c b/SP/code/ui/ui_shared.c
index 012c147..ed0efd1 100644
--- a/SP/code/ui/ui_shared.c
+++ b/SP/code/ui/ui_shared.c
@@ -5761,31 +5761,7 @@ Hacks to fix issues with menu scripts
 ===
 */
 static void Item_ApplyHacks( itemDef_t *item ) {
-
-   // Fix length of favorite address in createfavorite.menu
-   if ( item->type == ITEM_TYPE_EDITFIELD && item->cvar && !Q_stricmp( 
item->cvar, "ui_favoriteAddress" ) ) {
-   editFieldDef_t *editField = (editFieldDef_t *)item->typeData;
-
-   // enough to hold an IPv6 address plus null
-   if ( editField->maxChars < 48 ) {
-   Com_Printf( "Extended create favorite address edit 
field length to hold an IPv6 address\n" );
-   editField->maxChars = 48;
-   }
-   }
-
-   if ( item->type == ITEM_TYPE_EDITFIELD && item->cvar && ( !Q_stricmp( 
item->cvar, "ui_Name" ) || !Q_stricmp( item->cvar, "ui_findplayer" ) ) ) {
-   editFieldDef_t *editField = (editFieldDef_t *)item->typeData;
-
-   // enough to hold a full player name
-   if ( editField->maxChars < MAX_NAME_LENGTH ) {
-   if ( editField->maxPaintChars > editField->maxChars ) {
-   editField->maxPaintChars = editField->maxChars;
-   }
-
-   Com_Printf( "Extended player name field using cvar %s 
to %d characters\n", item->cvar, MAX_NAME_LENGTH );
-   editField->maxChars = MAX_NAME_LENGTH;
-   }
-   }
+   // Stub - Not used in SP
 }
 
 /*

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 478/497: All: Add changed cvar docs for reference

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 926deb7df7f326c184afdfceb7ae65a31fbeae3f
Author: MAN-AT-ARMS 
Date:   Sun Dec 13 13:42:45 2015 -0500

All: Add changed cvar docs for reference
---
 iortcw-cvars-new.txt | 134 +++
 iortcw-cvars-removed.txt |  36 +
 rend2-cvars.txt  |  65 +++
 3 files changed, 235 insertions(+)

diff --git a/iortcw-cvars-new.txt b/iortcw-cvars-new.txt
new file mode 100644
index 000..34a958c
--- /dev/null
+++ b/iortcw-cvars-new.txt
@@ -0,0 +1,134 @@
+cg_fixedAspect ""0"""
+
+cl_autoRecordDemo ""0"""
+cl_aviFrameRate ""25"""
+cl_aviMotionJpeg ""1"""
+cl_bypassMouseInput ""0"""
+cl_consoleKeys ""~ ` 0x7e 0x60"""
+cl_conXOffset ""0"""
+cl_cURLLib ""libcurl.so.4"""
+cl_guid ""NO_GUID"""
+cl_guidServerUniq ""1"""
+cl_lanForcePackets ""1"""
+cl_maxpackets ""38"""
+cl_mouseAccelOffset ""5"""
+cl_mouseAccelStyle ""0"""
+cl_mumbleScale ""0.0254"""
+cl_packetdelay ""0"""
+cl_renderer ""opengl1"""
+cl_showPing ""0"""
+cl_timedemoLog "
+cl_useMumble ""0"""
+cl_voip ""1"""
+cl_voipCaptureMult ""2.0"""
+cl_voipGainDuringCapture ""0.2"""
+cl_voipProtocol ""opus"""
+cl_voipSend ""0"""
+cl_voipSendTarget ""spatial"""
+cl_voipShowMeter ""1"""
+cl_voipUseVAD ""0"""
+cl_voipVADThreshold ""0.25"""
+
+com_abnormalExit ""0"""
+com_altivec ""0"""
+com_ansiColor ""0"""
+com_basegame ""main"""
+com_busyWait ""0"""
+com_errorMessage "
+com_gamename ""wolfmp"""
+com_homepath "
+com_legacyprotocol ""60"""
+com_legacyversion ""0"""
+com_maxfpsMinimized ""0"""
+com_maxfpsUnfocused ""0"""
+com_minimized ""0"""
+com_pipefile "
+com_protocol ""61"""
+com_standalone ""0"""
+com_unfocused ""0"""
+
+fs_basegame "
+fs_steampath "
+
+in_availableJoysticks "
+in_keyboardDebug ""0"""
+
+j_forward ""-0.25"""
+j_forward_axis ""1"""
+j_pitch ""0.022"""
+j_pitch_axis ""3"""
+j_side ""0.25"""
+j_side_axis ""0"""
+j_up ""1"""
+j_up_axis ""2"""
+j_yaw ""-0.022"""
+j_yaw_axis ""4"""
+
+net_dropsim "
+net_enabled ""3"""
+net_ip6 ""::"""
+net_mcast6addr ""ff04::696f:7175:616b:6533"""
+net_mcast6iface "
+net_port6 ""27960"""
+net_socksEnabled ""0"""
+net_socksPassword "
+net_socksPort ""1080"""
+net_socksServer "
+net_socksUsername "
+
+r_allowResize ""0"""
+r_anaglyphMode ""0"""
+r_availableModes "
+r_aviMotionJpegQuality ""90"""
+r_bloom ""0"""
+r_bloom_alpha ""0.3"""
+r_bloom_darken ""4"""
+r_bloom_diamond_size ""8"""
+r_bloom_fast_sample ""0"""
+r_bloom_intensity ""1.3"""
+r_bloom_sample_size ""128"""
+r_centerWindow ""0"""
+r_customPixelAspect ""1"""
+r_ext_max_anisotropy ""2"""
+r_ext_multisample ""0"""
+r_flareCoeff ""150"""
+r_fullbright ""0"""
+r_greyscale ""0"""
+r_marksOnTriangleMeshes ""0"""
+r_noborder ""0"""
+r_screenshotJpegQuality ""90"""
+r_sdlDriver ""x11"""
+r_stereoEnabled ""0"""
+r_stereoSeparation ""64"""
+r_windowPosx ""0"""
+r_windowPosy ""0"""
+r_zproj ""64"""
+
+s_alAvailableDevices ""Built-in Audio Analog Stereo"
+s_alAvailableInputDevices ""Built-in Audio Analog Stereo"
+s_alCapture ""1"""
+s_alDevice "
+s_alDopplerFactor ""1.0"""
+s_alDopplerSpeed ""9000"""
+s_alDriver ""libopenal.so.1"""
+s_alGain ""1.0"""
+s_alGraceDistance ""512"""
+s_alInputDevice "
+s_alMaxDistance ""1024"""
+s_alMinDistance ""120"""
+s_alPrecache ""1"""
+s_alRolloff ""2"""
+s_alSources ""128"""
+s_backend ""OpenAL"""
+s_muteWhenMinimized ""0"""
+s_muteWhenUnfocused ""0"""
+s_useOpenAL ""1"""
+
+sv_banFile ""serverbans.dat"""
+sv_dlRate ""100"""
+sv_dlURL "
+sv_levelTimeReset ""0"""
+sv_minRate ""0"""
+sv_packetdelay ""0"""
+sv_voip ""1"""
+sv_voipProtocol ""opus"""
diff --git a/iortcw-cvars-removed.txt b/iortcw-cvars-removed.txt
new file mode 100644
index 000..4998936
--- /dev/null
+++ b/iortcw-cvars-removed.txt
@@ -0,0 +1,36 @@
+cl_cacheGathering ""0"""
+com_dropsim ""0"""
+com_missingFiles "
+com_soundMegs ""24"""
+fs_cdpath "
+fs_copyfiles ""0"""
+fs_restrict "
+in_debugjoystick ""0"""
+in_dgamouse ""1"""
+in_subframe ""1"""
+net_noudp ""0"""
+r_cache ""1"""
+r_cacheModels ""1"""
+r_cacheShaders ""1"""
+r_customaspect ""1""" -> r_customPixelAspect ""1"""
+r_ext_gamma_control ""1"""
+r_lowMemTextureSize ""512"""
+r_lowMemTextureThreshold ""40.0"""
+r_showSmp ""0"""
+r_smp ""0"""
+r_stereo ""0""" -> r_stereoEnabled ""0"""
+s_defaultsound ""0"""
+s_khz ""22"""
+s_mixahead ""0.2"""
+s_mixPreStep ""0.05"""
+s_wavonly ""0"""
+sndbits ""16"""
+sndchannels ""2"""
+snddevice ""/dev/dsp"""
+sndspeed ""0"""
+sv_mapname "
+sys_cpustring "
+ttycon ""1"""
+ui_browserSortKey ""4"""
+viewlog ""0"""
+
diff --git a/rend2-cvars.txt b/rend2-cvars.txt
new file mode 100644
index 000..e0e8345
--- /dev/null
+++ b/rend2-cvars.txt
@@ -0,0 +1,65 @@
+r_arb_half_float_pixel "1"
+r_arb_half_float_vertex "1"
+r_arb_seamless_cube_map "0"

[iortcw] 472/497: All: Rend2: Change default value of r_baseGloss

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit a4eb8506b84b2119b7b802b2b3048b55db796293
Author: MAN-AT-ARMS 
Date:   Thu Dec 10 12:53:14 2015 -0500

All: Rend2: Change default value of r_baseGloss
---
 MP/code/rend2/tr_init.c | 2 +-
 SP/code/rend2/tr_init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 0bf2cde..d60243a 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -1332,7 +1332,7 @@ void R_Register( void ) {
r_baseNormalY = ri.Cvar_Get( "r_baseNormalY", "1.0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseParallax = ri.Cvar_Get( "r_baseParallax", "0.05", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseSpecular = ri.Cvar_Get( "r_baseSpecular", "0.04", CVAR_ARCHIVE | 
CVAR_LATCH );
-   r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | 
CVAR_LATCH );
+   r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.1", CVAR_ARCHIVE | 
CVAR_LATCH );
r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE );
r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | 
CVAR_LATCH );
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index ce992bf..8340e5d 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -1355,7 +1355,7 @@ void R_Register( void ) {
r_baseNormalY = ri.Cvar_Get( "r_baseNormalY", "1.0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseParallax = ri.Cvar_Get( "r_baseParallax", "0.05", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseSpecular = ri.Cvar_Get( "r_baseSpecular", "0.04", CVAR_ARCHIVE | 
CVAR_LATCH );
-   r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | 
CVAR_LATCH );
+   r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.1", CVAR_ARCHIVE | 
CVAR_LATCH );
r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE );
r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | 
CVAR_LATCH );

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 467/497: All: Rend2: Add option in code for alternate overbright method

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit d210625caf3036a894fb7ea4ac9da925fe659e2b
Author: MAN-AT-ARMS 
Date:   Thu Dec 10 11:20:19 2015 -0500

All: Rend2: Add option in code for alternate overbright method
---
 MP/code/rend2/tr_bsp.c   | 11 ++-
 MP/code/rend2/tr_image.c |  4 
 MP/code/rend2/tr_local.h |  2 +-
 MP/code/rend2/tr_scene.c |  4 
 MP/code/rend2/tr_shade.c | 23 ---
 SP/code/rend2/tr_bsp.c   | 10 ++
 SP/code/rend2/tr_image.c |  4 
 SP/code/rend2/tr_local.h |  2 +-
 SP/code/rend2/tr_scene.c |  4 
 SP/code/rend2/tr_shade.c | 23 ---
 10 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/MP/code/rend2/tr_bsp.c b/MP/code/rend2/tr_bsp.c
index 399f2fc..cd4a1b2 100644
--- a/MP/code/rend2/tr_bsp.c
+++ b/MP/code/rend2/tr_bsp.c
@@ -107,7 +107,11 @@ static void R_ColorShiftLightingBytes( byte in[4], byte 
out[4] ) {
int shift, r, g, b;
 
// shift the color data based on overbright range
+#if defined(USE_OVERBRIGHT)
shift = r_mapOverBrightBits->integer - tr.overbrightBits;
+#else
+   shift = 0;
+#endif
 
// shift the data based on overbright range
r = in[0] << shift;
@@ -141,7 +145,9 @@ static void R_ColorShiftLightingFloats(float in[4], float 
out[4], float scale )
 {
float   r, g, b;
 
+#if defined(USE_OVERBRIGHT)
scale *= pow(2.0f, r_mapOverBrightBits->integer - tr.overbrightBits);
+#endif
 
r = in[0] * scale;
g = in[1] * scale;
@@ -3105,8 +3111,11 @@ void R_LoadLightGrid( lump_t *l ) {
 
if (hdrLightGrid)
{
+#if defined(USE_OVERBRIGHT)
float lightScale = pow(2, r_mapOverBrightBits->integer 
- tr.overbrightBits);
-
+#else
+   float lightScale = 1.0f;
+#endif
//ri.Printf(PRINT_ALL, "found!\n");
 
if (size != sizeof(float) * 6 * numGridPoints)
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index b6644ce..1dacfff 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -3029,7 +3029,11 @@ void R_SetColorMappings( void ) {
int inf;
 
// setup the overbright lighting
+#if defined(USE_OVERBRIGHT)
tr.overbrightBits = r_overBrightBits->integer;
+#else
+   tr.overbrightBits = 0;
+#endif
 
// allow 2 overbright bits
if ( tr.overbrightBits > 2 ) {
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index a3958db..8d46e50 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -65,7 +65,7 @@ typedef unsigned int glIndex_t;
 #define CUBE_MAP_SIZE  (1 << CUBE_MAP_MIPS)
  
 #define USE_VERT_TANGENT_SPACE
-
+#define USE_OVERBRIGHT
 
 // a trRefEntity_t has all the information passed in by
 // the client game, as well as some locally derived info
diff --git a/MP/code/rend2/tr_scene.c b/MP/code/rend2/tr_scene.c
index 68cd57c..c2b96f1 100644
--- a/MP/code/rend2/tr_scene.c
+++ b/MP/code/rend2/tr_scene.c
@@ -465,7 +465,11 @@ void RE_BeginScene(const refdef_t *fd)
}
else
{
+#if defined(USE_OVERBRIGHT)
float scale = pow(2, r_mapOverBrightBits->integer - 
tr.overbrightBits - 8);
+#else
+   float scale = (1 << r_mapOverBrightBits->integer) / 
255.0f;
+#endif
if (r_forceSun->integer)
{
VectorScale(tr.sunLight, scale * 
r_forceSunLightScale->value,   tr.refdef.sunCol);
diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index b5d6709..abd214e 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -479,9 +479,22 @@ static void ProjectDlightTexture( void ) {
 
 static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, 
vec4_t vertColor, int blend )
 {
+   qboolean isBlend = ((blend & GLS_SRCBLEND_BITS) == 
GLS_SRCBLEND_DST_COLOR)
+   || ((blend & GLS_SRCBLEND_BITS) == 
GLS_SRCBLEND_ONE_MINUS_DST_COLOR)
+   || ((blend & GLS_DSTBLEND_BITS) == GLS_DSTBLEND_SRC_COLOR)
+   || ((blend & GLS_DSTBLEND_BITS) == 
GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);
+
+   qboolean isWorldDraw = !(backEnd.refdef.rdflags & RDF_NOWORLDMODEL);
+
+#if defined(USE_OVERBRIGHT)
+   float exactLight = 1.0f;
+#else
+   float exactLight = (isBlend || !isWorldDraw) ? 1.0f : (float)(1 << 
r_mapOverBrightBits->integer);
+#endif
+
baseColor[0] = 
baseColor[1] =
-   baseColor[2] =
+   baseColor[2] = exactLight;
baseColor[3] = 1.0f;
 
vertColor[0] =
@@ -508,7 +521,7 @@ static void ComputeShaderColors( shaderStage_t *pStage, 
vec4_t baseColor, vec4_t
 
vertColor[0] =
vertColor[1] =
-   vertColor[2] = 

[iortcw] 468/497: All: Rend2: Add r_glossIsRoughness

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit ecfdf315187c07e787f5b28859883b3d98b84982
Author: MAN-AT-ARMS 
Date:   Thu Dec 10 11:35:17 2015 -0500

All: Rend2: Add r_glossIsRoughness
---
 MP/code/rend2/tr_glsl.c   |  3 +++
 MP/code/rend2/tr_init.c   |  2 ++
 MP/code/rend2/tr_local.h  |  1 +
 MP/code/rend2/tr_shade.c  |  3 +--
 MP/code/rend2/tr_shader.c | 49 +--
 SP/code/rend2/tr_glsl.c   |  3 +++
 SP/code/rend2/tr_init.c   |  2 ++
 SP/code/rend2/tr_local.h  |  1 +
 SP/code/rend2/tr_shade.c  |  3 +--
 SP/code/rend2/tr_shader.c | 49 +--
 10 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index 9a10e12..9d87bad 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -1043,6 +1043,9 @@ void GLSL_InitGPUShaders(void)
if (r_specularIsMetallic->value)
Q_strcat(extradefines, 1024, "#define 
SPECULAR_IS_METALLIC\n");
 
+   if (r_glossIsRoughness->value)
+   Q_strcat(extradefines, 1024, "#define 
GLOSS_IS_ROUGHNESS\n");
+
if (r_dlightMode->integer >= 2)
Q_strcat(extradefines, 1024, "#define USE_SHADOWMAP\n");
 
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 42b19b7..0bf2cde 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -162,6 +162,7 @@ cvar_t  *r_deluxeMapping;
 cvar_t  *r_parallaxMapping;
 cvar_t  *r_cubeMapping;
 cvar_t  *r_specularIsMetallic;
+cvar_t  *r_glossIsRoughness;
 cvar_t  *r_baseNormalX;
 cvar_t  *r_baseNormalY;
 cvar_t  *r_baseParallax;
@@ -1326,6 +1327,7 @@ void R_Register( void ) {
r_parallaxMapping = ri.Cvar_Get( "r_parallaxMapping", "0", CVAR_ARCHIVE 
| CVAR_LATCH );
r_cubeMapping = ri.Cvar_Get( "r_cubeMapping", "0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_specularIsMetallic = ri.Cvar_Get( "r_specularIsMetallic", "0", 
CVAR_ARCHIVE | CVAR_LATCH );
+   r_glossIsRoughness = ri.Cvar_Get("r_glossIsRoughness", "0", 
CVAR_ARCHIVE | CVAR_LATCH);
r_baseNormalX = ri.Cvar_Get( "r_baseNormalX", "1.0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseNormalY = ri.Cvar_Get( "r_baseNormalY", "1.0", CVAR_ARCHIVE | 
CVAR_LATCH );
r_baseParallax = ri.Cvar_Get( "r_baseParallax", "0.05", CVAR_ARCHIVE | 
CVAR_LATCH );
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index 8d46e50..a0e46c2 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -1985,6 +1985,7 @@ extern  cvar_t  *r_deluxeMapping;
 extern  cvar_t  *r_parallaxMapping;
 extern  cvar_t  *r_cubeMapping;
 extern  cvar_t  *r_specularIsMetallic;
+extern  cvar_t  *r_glossIsRoughness;
 extern  cvar_t  *r_baseNormalX;
 extern  cvar_t  *r_baseNormalY;
 extern  cvar_t  *r_baseParallax;
diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index abd214e..f4f3bb8 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -484,11 +484,10 @@ static void ComputeShaderColors( shaderStage_t *pStage, 
vec4_t baseColor, vec4_t
|| ((blend & GLS_DSTBLEND_BITS) == GLS_DSTBLEND_SRC_COLOR)
|| ((blend & GLS_DSTBLEND_BITS) == 
GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);
 
-   qboolean isWorldDraw = !(backEnd.refdef.rdflags & RDF_NOWORLDMODEL);
-
 #if defined(USE_OVERBRIGHT)
float exactLight = 1.0f;
 #else
+   qboolean isWorldDraw = !(backEnd.refdef.rdflags & RDF_NOWORLDMODEL);
float exactLight = (isBlend || !isWorldDraw) ? 1.0f : (float)(1 << 
r_mapOverBrightBits->integer);
 #endif
 
diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index c5ba330..075ac71 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -932,17 +932,23 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
 
exponent = atof( token );
 
-   // Change shininess to gloss
-   // FIXME: assumes max exponent of 8192 and min of 1, 
must change here if altered in lightall_fp.glsl
-   exponent = CLAMP(exponent, 1.0, 8192.0);
-
-   stage->specularScale[3] = log(exponent) / log(8192.0);
+   if (r_glossIsRoughness->integer)
+   stage->specularScale[3] = powf(2.0f / (exponent 
+ 2.0), 0.25);
+   else
+   {
+   // Change shininess to gloss
+   // Assumes max exponent of 8190 and min of 0, 
must change here if altered in lightall_fp.glsl
+   exponent = CLAMP(exponent, 0.0f, 8190.0f);
+   stage->specularScale[3] = (log2f(exponent + 
2.0f) - 1.0f) / 12.0f;
+   }
}

[iortcw] 475/497: All: Fix the defines for OSX in minizip

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit ab6b4571430f22a1e8b378d029687cfde473009e
Author: MAN-AT-ARMS 
Date:   Sat Dec 12 11:24:30 2015 -0500

All: Fix the defines for OSX in minizip
---
 MP/code/zlib-1.2.8/ioapi.c | 2 +-
 MP/code/zlib-1.2.8/ioapi.h | 2 +-
 SP/code/zlib-1.2.8/ioapi.c | 2 +-
 SP/code/zlib-1.2.8/ioapi.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MP/code/zlib-1.2.8/ioapi.c b/MP/code/zlib-1.2.8/ioapi.c
index 15cb49b..f1c3aec 100644
--- a/MP/code/zlib-1.2.8/ioapi.c
+++ b/MP/code/zlib-1.2.8/ioapi.c
@@ -14,7 +14,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__MACOS_X__) || defined(IOAPI_NO_64)
+#if defined(MACOS_X) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no 
need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
diff --git a/MP/code/zlib-1.2.8/ioapi.h b/MP/code/zlib-1.2.8/ioapi.h
index 2343e90..f951d26 100644
--- a/MP/code/zlib-1.2.8/ioapi.h
+++ b/MP/code/zlib-1.2.8/ioapi.h
@@ -21,7 +21,7 @@
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X))
 
   // Linux needs this to support file operation on files larger then 4+GB
   // But might need better if/def to select just the platforms that needs them.
diff --git a/SP/code/zlib-1.2.8/ioapi.c b/SP/code/zlib-1.2.8/ioapi.c
index 15cb49b..f1c3aec 100644
--- a/SP/code/zlib-1.2.8/ioapi.c
+++ b/SP/code/zlib-1.2.8/ioapi.c
@@ -14,7 +14,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__MACOS_X__) || defined(IOAPI_NO_64)
+#if defined(MACOS_X) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no 
need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
diff --git a/SP/code/zlib-1.2.8/ioapi.h b/SP/code/zlib-1.2.8/ioapi.h
index 2343e90..f951d26 100644
--- a/SP/code/zlib-1.2.8/ioapi.h
+++ b/SP/code/zlib-1.2.8/ioapi.h
@@ -21,7 +21,7 @@
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X))
 
   // Linux needs this to support file operation on files larger then 4+GB
   // But might need better if/def to select just the platforms that needs them.

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 474/497: All: Only link against internal SDL libs when cross-compiling on Linux

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 0af5a8b5612ca942ea74a7b5d841867532872db7
Author: MAN-AT-ARMS 
Date:   Sat Dec 12 08:25:52 2015 -0500

All: Only link against internal SDL libs when cross-compiling on Linux
---
 MP/Makefile | 16 +---
 SP/Makefile | 16 +---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 2abbc2a..9732628 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -418,13 +418,15 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" 
"gnu_kfreebsd" "kfreebsd-gnu" "gnu")
   endif
 
   ifeq ($(USE_INTERNAL_LIBS),1)
-ifeq ($(ARCH),x86)
-SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
-   $(LIBSDIR)/linux32/libSDL2.so
-endif
-ifeq ($(ARCH),x86_64)
-SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
-   $(LIBSDIR)/linux64/libSDL2.so
+ifeq ($(CROSS_COMPILING),1)
+  ifeq ($(ARCH),x86)
+  SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
+ $(LIBSDIR)/linux32/libSDL2.so
+  endif
+  ifeq ($(ARCH),x86_64)
+  SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
+ $(LIBSDIR)/linux64/libSDL2.so
+  endif
 endif
   endif
 
diff --git a/SP/Makefile b/SP/Makefile
index 0ae5334..7a0fc62 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -407,13 +407,15 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" 
"gnu_kfreebsd" "kfreebsd-gnu" "gnu")
   endif
 
   ifeq ($(USE_INTERNAL_LIBS),1)
-ifeq ($(ARCH),x86)
-SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
-   $(LIBSDIR)/linux32/libSDL2.so
-endif
-ifeq ($(ARCH),x86_64)
-SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
-   $(LIBSDIR)/linux64/libSDL2.so
+ifeq ($(CROSS_COMPILING),1)
+  ifeq ($(ARCH),x86)
+  SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
+ $(LIBSDIR)/linux32/libSDL2.so
+  endif
+  ifeq ($(ARCH),x86_64)
+  SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
+ $(LIBSDIR)/linux64/libSDL2.so
+  endif
 endif
   endif
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 471/497: All: Update lightall_fp.glsl

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 1e2b250d2636f1ec1bef33cb1b9b4773cd480317
Author: MAN-AT-ARMS 
Date:   Thu Dec 10 12:11:17 2015 -0500

All: Update lightall_fp.glsl
---
 MP/code/rend2/glsl/lightall_fp.glsl | 60 -
 SP/code/rend2/glsl/lightall_fp.glsl | 60 -
 2 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/MP/code/rend2/glsl/lightall_fp.glsl 
b/MP/code/rend2/glsl/lightall_fp.glsl
index dda05ea..17dc9fc 100644
--- a/MP/code/rend2/glsl/lightall_fp.glsl
+++ b/MP/code/rend2/glsl/lightall_fp.glsl
@@ -150,11 +150,11 @@ float RayIntersectDisplaceMap(vec2 dp, vec2 ds, sampler2D 
normalMap)
 }
 #endif
 
-vec3 CalcDiffuse(vec3 diffuseAlbedo, float EH, float NH, float r)
+vec3 CalcDiffuse(vec3 diffuseAlbedo, float EH, float NH, float roughness)
 {
 #if defined(USE_BURLEY)
// modified from 
https://disney-animation.s3.amazonaws.com/library/s2012_pbs_disney_brdf_notes_v2.pdf
-   float fd90 = -0.5 + EH * EH * r;
+   float fd90 = -0.5 + EH * EH * roughness;
float burley = 1.0 + fd90 * 0.04 / NH;
burley *= burley;
return diffuseAlbedo * burley;
@@ -163,22 +163,22 @@ vec3 CalcDiffuse(vec3 diffuseAlbedo, float EH, float NH, 
float r)
 #endif
 }
 
-vec3 EnvironmentBRDF(float r, float NE, vec3 specular)
+vec3 EnvironmentBRDF(float roughness, float NE, vec3 specular)
 {
// from 
http://community.arm.com/servlet/JiveServlet/download/96891546-19496/siggraph2015-mmg-renaldas-slides.pdf
-   float v = 1.0 - max(r, NE);
+   float v = 1.0 - max(roughness, NE);
v *= v * v;
return vec3(v) + specular;
 }
 
-vec3 CalcSpecular(vec3 specular, float NH, float NL, float NE, float EH, float 
r)
+vec3 CalcSpecular(vec3 specular, float NH, float NL, float NE, float EH, float 
roughness)
 {
// from 
http://community.arm.com/servlet/JiveServlet/download/96891546-19496/siggraph2015-mmg-renaldas-slides.pdf
-   float rr = r*r;
+   float rr = roughness*roughness;
float  = rr*rr;
float d = (NH * NH) * ( - 1.0) + 1.0;
-   float v = (EH * EH) * (r + 0.5);
-   return specular * ( / (4.0 * 3.141593 * d * d * v));
+   float v = (EH * EH) * (roughness + 0.5);
+   return specular * ( / (4.0 * d * d * v));
 }
 
 
@@ -276,6 +276,11 @@ void main()
attenuation  = 1.0;
   #endif
 
+  #if defined(r_lightGamma)
+   lightColor   = pow(lightColor,   vec3(r_lightGamma));
+   ambientColor = pow(ambientColor, vec3(r_lightGamma));
+  #endif
+
   #if defined(USE_NORMALMAP)
 #if defined(SWIZZLE_NORMALMAP)
N.xy = texture2D(u_NormalMap, texCoords).ag - vec2(0.5);
@@ -304,11 +309,6 @@ void main()
 #endif
   #endif
 
-  #if defined(r_lightGamma)
-   lightColor   = pow(lightColor,   vec3(r_lightGamma));
-   ambientColor = pow(ambientColor, vec3(r_lightGamma));
-  #endif
-
   #if defined(USE_LIGHTMAP) || defined(USE_LIGHT_VERTEX)
ambientColor = lightColor;
float surfNL = clamp(dot(var_Normal.xyz, L), 0.0, 1.0);
@@ -343,7 +343,11 @@ void main()
   #endif
 
float gloss = specular.a;
-   float r = exp2(-3.0 * gloss);
+  #if defined(GLOSS_IS_ROUGHNESS)
+   float roughness = gloss;
+  #else
+   float roughness = exp2(-3.0 * gloss);
+  #endif
 
   #if defined(SPECULAR_IS_METALLIC)
// diffuse is actually base color, and green of specular is metallicness
@@ -356,21 +360,13 @@ void main()
diffuse.rgb *= vec3(1.0) - specular.rgb;
   #endif
 
-   reflectance  = CalcDiffuse(diffuse.rgb, EH, NH, r);
-  #if defined(USE_SHADOWMAP) && defined(SHADOWMAP_MODULATE)
-   // bit of a hack, with modulated shadowmaps, add specular to sunlight
-   H = normalize(var_PrimaryLightDir.xyz + E);
-   EH = clamp(dot(E, H), 0.0, 1.0);
-   NH = clamp(dot(N, H), 0.0, 1.0);
-   //reflectance += shadowValue * CalcSpecular(specular.rgb, NH, NL, NE, 
EH, r);
-   reflectance += (shadowValue * (1.0 - u_PrimaryLightAmbient.r)) * 
CalcSpecular(specular.rgb, NH, NL, NE, EH, r);
-  #endif
+   reflectance  = CalcDiffuse(diffuse.rgb, EH, NH, roughness);
 
gl_FragColor.rgb  = lightColor   * reflectance * (attenuation * NL);
gl_FragColor.rgb += ambientColor * (diffuse.rgb + specular.rgb);
 
   #if defined(USE_CUBEMAP)
-   reflectance = EnvironmentBRDF(r, NE, specular.rgb);
+   reflectance = EnvironmentBRDF(roughness, NE, specular.rgb);
 
vec3 R = reflect(E, N);
 
@@ -378,7 +374,11 @@ void main()
// from 
http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir;
 
+#if defined(GLOSS_IS_ROUGHNESS)
+   vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax, 7.0 * 
roughness).rgb *