[ioquake3] annotated tag debian/1.36+u20170720+dfsg1-1 created (now 3370f79)

[Simon McVittie]

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

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

at  3370f79   (tag)
   tagging  5232119b62093af522c5ab24fb9897ca77b5528c (commit)
  replaces  debian/1.36+u20170611+dfsg1-1
 tagged by  Simon McVittie
on  Sun Jul 23 22:54:05 2017 +0100

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

iQIzBAABCAAdFiEE2pjyXAhxxJpZ6v8sTej/KmPHzJAFAll1Gv0ACgkQTej/KmPH
zJDgGg//RAjH42NTUzLsPdGQ5RahHp+eHTzPtKeAqwJIBIWs7Kt3X9BrroAZDvFX
2y5Mz4slvycjfb1MgTImOwukaO1GR3PLufSLamr8FpAKE90e8tLUSmX6rVU9fxqC
nRzIjuOvAe8hpDDJakBynw8JT5bGqWWfSORti2XJv+ESFd5CsA1U+nAaryLyreMO
qYtw6YznKY2YpOMQQrTEzgFNtqCZlmyifbfLIH9GqTz8ljZkY73j2xRKZy/QH7ky
BFoYZ/tPsPdNrlBZN4Sfyw1ib57FcGkq3YU6FSrhR5sl9V8R9XVdLDPNRQdgTePO
UEeAoN1eUhd0raTMl/Ua4Ig8boK0qxu+k3CTmgadnmhgkzilznNf7mdAPRBy+MSC
xMM/GRkGVMCttvy62TQa4P4Ze3IP3yvGUzUiQ8Ql4YKZ5RKJITzJ833fFanEdSe3
PE4+VZRKmcChVqRzjH7CJEpWL/vR6ZdDU1Qv8Nk+3m1mALZ0yPlUXZz2E/fWZ2JW
kJAGGTuXyirhH3ujBcvIMzZCOEIA/pVL6ONOex1JamMePH+j+++zle8gdOSGJLTd
2f+PTUdTJTNN3v53XknSxA2XNvoCk/74wAVFD8Qrv/RhSy3P8DK0/isW2HbpsTY9
9QzU/MJyAihwEEEt/aMa1UciQ/iaZAKThgtMyTbG0K313UFxsXA=
=oVAt
-END PGP SIGNATURE-

Brenton Bostick (1):
  Fix warning about using abs() with floats (#222)

Noah Metzger (1):
  Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash

Simon McVittie (6):
  debian/apparmor.d: allow even more device enumeration
  Declare compliance with Debian Policy 4.0.0
  New upstream version 1.36+u20170720+dfsg1
  Updated version 1.36+u20170720+dfsg1 from 'upstream/1.36+u20170720+dfsg1'
  New upstream snapshot
  1.36+u20170720+dfsg1-1

SmileTheory (6):
  OpenGL2: Remove SF_VAO_MESH.
  OpenGL2: Use an OpenGL 3.2 core context if available.
  OpenGL2: Remove GLSL_ValidateProgram().
  OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow views.
  OpenGL2: "Fix" cg_shadows 4.
  whoops, left a bit of debugging enabled

Zack Middleton (38):
  Fix g_teamAutoJoin and g_teamForceBalance
  Fix Team Arena team base models not dropping to floor
  Make cg_teamChatsOnly only affect team gametypes
  Check for unlimited time power up using INT_MAX
  Have spectator always be in first person
  Allow spectators to use noclip cheat
  travis-ci: Don't run coverity_scan on master branch
  travis-ci: Upgrade to docker build system
  Split G_AddRandomBot into multiple functions
  Make 'addbot random' command select a random bot info
  Fix random bot not looking for bots by funname
  Fix bot_minplayers passing delay as team to addbot in non-team gametypes
  Fix not adding random bot when all bot info are in use on team
  Check delayed bot's team when counting bots for bot_minplayers
  Fix duplicate (delayed) random bots being choosen
  Don't pick duplicate random bots until all bot types are added
  Add range check for bot skill in addbot command
  Add 'addbot random' to README
  OpenGL2: Fix checking r_shadowCascadeZFar pointer instead of value
  OpenGL2: Fix black planar projection shadows (cg_shadows 3)
  OpenGL2: Draw sun shadows for first person IQM player models
  Fix q3_ui cursor going off screen in widescreen
  Make Team Arena UI aspect correct in widescreen
  Make UI continue searching for local servers until found
  Allow changing q3_ui server source during refresh
  Fix nonresponsive favorites in q3_ui having no hostname
  OpenGL2: Remove two unused cvars and update readme
  Add warnings for animMap and videoMap shader keywords
  Allow more than 32 surfaces in skin files
  Improve warning for too many skin surfaces
  Fix set-but-not-used variable warnings in vm_armv7l.c
  Fix more maybe-uninitialized warnings in opusfile
  Fix misleading-indentation warnings in cl_cin.c
  Fix score bonus for defending the flag carrier in CTF
  Restore not giving defense score bonus to flag carrier
  Add score bonus for defending the flag carrier in 1 Flag CTF
  Make 'globalservers 0' fetch all masters
  Escape quotes for sv_dlURL in shell so it doesn't become "http:"

---

This annotated tag includes the following new commits:

   new  e03cdf4   OpenGL2: Remove SF_VAO_MESH.
   new  f7c3276   Fix g_teamAutoJoin and g_teamForceBalance
   new  f19efb7   Fix Team Arena team base models not dropping to floor
   new  520b100   Make cg_teamChatsOnly only affect team gametypes
   new  c2ca5e7   Check for unlimited time power up using INT_MAX
   new  7b9ccd1   Have spectator always be in first person
   new  03336dd   Allow spectators to use noclip cheat
   new  2e5c4bd   travis-ci: Don't run coverity_scan on master branch
   

[ioquake3] annotated tag upstream/1.36+u20170720+dfsg1 created (now 044c5a1)

[Simon McVittie]

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

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

at  044c5a1   (tag)
   tagging  64cb8bfbfd64541f3cfab594f933429b37085fde (commit)
  replaces  upstream/1.36+u20170611+dfsg1
 tagged by  Simon McVittie
on  Sun Jul 23 22:36:24 2017 +0100

- Log -
Upstream version 1.36+u20170720+dfsg1

Brenton Bostick (1):
  Fix warning about using abs() with floats (#222)

Noah Metzger (1):
  Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash

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

SmileTheory (6):
  OpenGL2: Remove SF_VAO_MESH.
  OpenGL2: Use an OpenGL 3.2 core context if available.
  OpenGL2: Remove GLSL_ValidateProgram().
  OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow views.
  OpenGL2: "Fix" cg_shadows 4.
  whoops, left a bit of debugging enabled

Zack Middleton (38):
  Fix g_teamAutoJoin and g_teamForceBalance
  Fix Team Arena team base models not dropping to floor
  Make cg_teamChatsOnly only affect team gametypes
  Check for unlimited time power up using INT_MAX
  Have spectator always be in first person
  Allow spectators to use noclip cheat
  travis-ci: Don't run coverity_scan on master branch
  travis-ci: Upgrade to docker build system
  Split G_AddRandomBot into multiple functions
  Make 'addbot random' command select a random bot info
  Fix random bot not looking for bots by funname
  Fix bot_minplayers passing delay as team to addbot in non-team gametypes
  Fix not adding random bot when all bot info are in use on team
  Check delayed bot's team when counting bots for bot_minplayers
  Fix duplicate (delayed) random bots being choosen
  Don't pick duplicate random bots until all bot types are added
  Add range check for bot skill in addbot command
  Add 'addbot random' to README
  OpenGL2: Fix checking r_shadowCascadeZFar pointer instead of value
  OpenGL2: Fix black planar projection shadows (cg_shadows 3)
  OpenGL2: Draw sun shadows for first person IQM player models
  Fix q3_ui cursor going off screen in widescreen
  Make Team Arena UI aspect correct in widescreen
  Make UI continue searching for local servers until found
  Allow changing q3_ui server source during refresh
  Fix nonresponsive favorites in q3_ui having no hostname
  OpenGL2: Remove two unused cvars and update readme
  Add warnings for animMap and videoMap shader keywords
  Allow more than 32 surfaces in skin files
  Improve warning for too many skin surfaces
  Fix set-but-not-used variable warnings in vm_armv7l.c
  Fix more maybe-uninitialized warnings in opusfile
  Fix misleading-indentation warnings in cl_cin.c
  Fix score bonus for defending the flag carrier in CTF
  Restore not giving defense score bonus to flag carrier
  Add score bonus for defending the flag carrier in 1 Flag CTF
  Make 'globalservers 0' fetch all masters
  Escape quotes for sv_dlURL in shell so it doesn't become "http:"

---

This annotated tag includes the following new commits:

   new  e03cdf4   OpenGL2: Remove SF_VAO_MESH.
   new  f7c3276   Fix g_teamAutoJoin and g_teamForceBalance
   new  f19efb7   Fix Team Arena team base models not dropping to floor
   new  520b100   Make cg_teamChatsOnly only affect team gametypes
   new  c2ca5e7   Check for unlimited time power up using INT_MAX
   new  7b9ccd1   Have spectator always be in first person
   new  03336dd   Allow spectators to use noclip cheat
   new  2e5c4bd   travis-ci: Don't run coverity_scan on master branch
   new  ccfc901   travis-ci: Upgrade to docker build system
   new  007e250   Split G_AddRandomBot into multiple functions
   new  23a331c   Make 'addbot random' command select a random bot info
   new  5164969   Fix random bot not looking for bots by funname
   new  d0d1fe1   Fix bot_minplayers passing delay as team to addbot in 
non-team gametypes
   new  7c601da   Fix not adding random bot when all bot info are in use on 
team
   new  d8f2ff7   Check delayed bot's team when counting bots for 
bot_minplayers
   new  0999aff   Fix duplicate (delayed) random bots being choosen
   new  cabc323   Don't pick duplicate random bots until all bot types are 
added
   new  b984dd4   Add range check for bot skill in addbot command
   new  4b5067c   Add 'addbot random' to README
   new  09a23e0   OpenGL2: Fix checking r_shadowCascadeZFar pointer instead 
of value
   new  102c79e   OpenGL2: Fix black planar projection shadows (cg_shadows 
3)
   new  e771537   OpenGL2: Draw sun shadows for first person IQM player 
models
   new  

[ioquake3] 50/50: 1.36+u20170720+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 5232119b62093af522c5ab24fb9897ca77b5528c
Author: Simon McVittie 
Date:   Sun Jul 23 22:38:31 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index b256567..f6bef4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-ioquake3 (1.36+u20170720+dfsg1-1) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20170720+dfsg1-1) unstable; urgency=medium
 
   * New upstream snapshot
   * debian/apparmor.d: allow even more device enumeration
   * Declare compliance with Debian Policy 4.0.0
 
- -- Simon McVittie   Sun, 25 Jun 2017 02:04:28 +0100
+ -- Simon McVittie   Sun, 23 Jul 2017 22:38:20 +0100
 
 ioquake3 (1.36+u20170611+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] branch upstream/latest updated (aaa2b09 -> 64cb8bf)

[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  aaa2b09   New upstream version 1.36+u20170611+dfsg1
   new  e03cdf4   OpenGL2: Remove SF_VAO_MESH.
   new  f7c3276   Fix g_teamAutoJoin and g_teamForceBalance
   new  f19efb7   Fix Team Arena team base models not dropping to floor
   new  520b100   Make cg_teamChatsOnly only affect team gametypes
   new  c2ca5e7   Check for unlimited time power up using INT_MAX
   new  7b9ccd1   Have spectator always be in first person
   new  03336dd   Allow spectators to use noclip cheat
   new  2e5c4bd   travis-ci: Don't run coverity_scan on master branch
   new  ccfc901   travis-ci: Upgrade to docker build system
   new  007e250   Split G_AddRandomBot into multiple functions
   new  23a331c   Make 'addbot random' command select a random bot info
   new  5164969   Fix random bot not looking for bots by funname
   new  d0d1fe1   Fix bot_minplayers passing delay as team to addbot in 
non-team gametypes
   new  7c601da   Fix not adding random bot when all bot info are in use on 
team
   new  d8f2ff7   Check delayed bot's team when counting bots for 
bot_minplayers
   new  0999aff   Fix duplicate (delayed) random bots being choosen
   new  cabc323   Don't pick duplicate random bots until all bot types are 
added
   new  b984dd4   Add range check for bot skill in addbot command
   new  4b5067c   Add 'addbot random' to README
   new  09a23e0   OpenGL2: Fix checking r_shadowCascadeZFar pointer instead 
of value
   new  102c79e   OpenGL2: Fix black planar projection shadows (cg_shadows 
3)
   new  e771537   OpenGL2: Draw sun shadows for first person IQM player 
models
   new  d9c2e91   Fix q3_ui cursor going off screen in widescreen
   new  21eeaee   Make Team Arena UI aspect correct in widescreen
   new  0ba359c   Make UI continue searching for local servers until found
   new  8c3d1fc   Allow changing q3_ui server source during refresh
   new  cbd9e43   Fix nonresponsive favorites in q3_ui having no hostname
   new  5aa7fb3   OpenGL2: Remove two unused cvars and update readme
   new  4dffc52   Add warnings for animMap and videoMap shader keywords
   new  904bbc1   Allow more than 32 surfaces in skin files
   new  dd73e19   Improve warning for too many skin surfaces
   new  7c25206   Fix set-but-not-used variable warnings in vm_armv7l.c
   new  a33a904   Fix warning about using abs() with floats (#222)
   new  e78da55   Fix more maybe-uninitialized warnings in opusfile
   new  51ca4d3   Fix misleading-indentation warnings in cl_cin.c
   new  d549b64   OpenGL2: Use an OpenGL 3.2 core context if available.
   new  a4c0923   OpenGL2: Remove GLSL_ValidateProgram().
   new  6a77f4e   OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow 
views.
   new  6f1712d   OpenGL2: "Fix" cg_shadows 4.
   new  786f6fc   whoops, left a bit of debugging enabled
   new  c8db6c5   Fix score bonus for defending the flag carrier in CTF
   new  13831f9   Restore not giving defense score bonus to flag carrier
   new  5f2e4a0   Add score bonus for defending the flag carrier in 1 Flag 
CTF
   new  fa1549d   Move CON_Init ahead of Com_Init to avoid Windows 
dedicated server crash
   new  9f239d6   Make 'globalservers 0' fetch all masters
   new  67dace6   Escape quotes for sv_dlURL in shell so it doesn't become 
"http:"
   new  64cb8bf   New upstream version 1.36+u20170720+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:
 .travis.yml  |  24 ++-
 README.md|   2 +
 code/cgame/cg_draw.c |  11 +-
 code/cgame/cg_newdraw.c  |  11 +-
 code/cgame/cg_servercmds.c   |  45 ++--
 code/cgame/cg_view.c |   3 +-
 code/client/cl_cin.c |  16 +-
 code/client/cl_main.c|  37 +++-
 code/game/ai_dmq3.c  |   7 +-
 code/game/g_active.c |   7 +-
 code/game/g_bot.c| 212 ---
 code/game/g_client.c |  40 ++--
 code/game/g_cmds.c   |   6 +-
 code/game/g_local.h  |   4 +-
 code/game/g_main.c   |   4 +-
 code/game/g_session.c|  27 ++-
 code/game/g_team.c   |  80 +++
 code/q3_ui/ui_atoms.c|  12 +-
 code/q3_ui/ui_main.c |   7 +-
 code/q3_ui/ui_servers2.c |  99 -
 code/q3_ui/ui_startserver.c  |   4 +
 

[ioquake3] 47/50: New upstream version 1.36+u20170720+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 64cb8bfbfd64541f3cfab594f933429b37085fde
Merge: aaa2b09 67dace6
Author: Simon McVittie 
Date:   Sun Jul 23 22:36:17 2017 +0100

New upstream version 1.36+u20170720+dfsg1

 .travis.yml  |  24 ++-
 README.md|   2 +
 code/cgame/cg_draw.c |  11 +-
 code/cgame/cg_newdraw.c  |  11 +-
 code/cgame/cg_servercmds.c   |  45 ++--
 code/cgame/cg_view.c |   3 +-
 code/client/cl_cin.c |  16 +-
 code/client/cl_main.c|  37 +++-
 code/game/ai_dmq3.c  |   7 +-
 code/game/g_active.c |   7 +-
 code/game/g_bot.c| 212 ---
 code/game/g_client.c |  40 ++--
 code/game/g_cmds.c   |   6 +-
 code/game/g_local.h  |   4 +-
 code/game/g_main.c   |   4 +-
 code/game/g_session.c|  27 ++-
 code/game/g_team.c   |  80 +++
 code/q3_ui/ui_atoms.c|  12 +-
 code/q3_ui/ui_main.c |   7 +-
 code/q3_ui/ui_servers2.c |  99 -
 code/q3_ui/ui_startserver.c  |   4 +
 code/qcommon/vm_armv7l.c |  28 ++-
 code/renderercommon/qgl.h| 127 ++-
 code/renderercommon/tr_common.h  |   2 +-
 code/renderergl1/tr_animation.c  |   4 +-
 code/renderergl1/tr_image.c  |  36 ++--
 code/renderergl1/tr_init.c   |   2 +-
 code/renderergl1/tr_local.h  |   8 +-
 code/renderergl1/tr_mesh.c   |   4 +-
 code/renderergl1/tr_model_iqm.c  |   4 +-
 code/renderergl1/tr_shader.c |  10 +
 code/renderergl2/glsl/dlight_fp.glsl |  22 +-
 code/renderergl2/glsl/generic_fp.glsl|  23 +-
 code/renderergl2/glsl/lightall_fp.glsl   |  21 +-
 code/renderergl2/glsl/pshadow_fp.glsl|  44 ++--
 code/renderergl2/glsl/shadowmask_fp.glsl |  28 +--
 code/renderergl2/tr_animation.c  |   4 +-
 code/renderergl2/tr_backend.c| 351 +++
 code/renderergl2/tr_dsa.c|  46 ++--
 code/renderergl2/tr_extensions.c |  99 +++--
 code/renderergl2/tr_fbo.c| 128 ++-
 code/renderergl2/tr_glsl.c   |  28 +--
 code/renderergl2/tr_image.c  |  55 +++--
 code/renderergl2/tr_init.c   |  27 ++-
 code/renderergl2/tr_light.c  |   1 -
 code/renderergl2/tr_local.h  |  23 +-
 code/renderergl2/tr_main.c   |   2 +-
 code/renderergl2/tr_mesh.c   |  30 ++-
 code/renderergl2/tr_model_iqm.c  |   7 +-
 code/renderergl2/tr_scene.c  |   2 +-
 code/renderergl2/tr_shade.c  |  24 +++
 code/renderergl2/tr_shader.c |  14 +-
 code/renderergl2/tr_shadows.c|   4 +-
 code/renderergl2/tr_sky.c|   2 +
 code/renderergl2/tr_surface.c|  38 +---
 code/renderergl2/tr_world.c  |   2 -
 code/sdl/sdl_glimp.c |  51 -
 code/sys/sys_main.c  |   3 +-
 code/ui/ui_atoms.c   |  10 +-
 code/ui/ui_main.c|  86 +---
 code/ui/ui_shared.c  |   8 +-
 misc/linux/start_server.sh   |   8 +-
 misc/osx/start_server.sh |   8 +-
 opengl2-readme.md|  21 +-
 64 files changed, 1095 insertions(+), 1008 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] 48/50: Updated version 1.36+u20170720+dfsg1 from 'upstream/1.36+u20170720+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 204b03d3300885f8b3f455483552d7b787fa
Merge: 8a2eb42 64cb8bf
Author: Simon McVittie 
Date:   Sun Jul 23 22:36:24 2017 +0100

Updated version 1.36+u20170720+dfsg1 from 'upstream/1.36+u20170720+dfsg1'

with Debian dir ede0c96dacc27386778c8b94e6368daad0303bb9

 .travis.yml  |  24 ++-
 README.md|   2 +
 code/cgame/cg_draw.c |  11 +-
 code/cgame/cg_newdraw.c  |  11 +-
 code/cgame/cg_servercmds.c   |  45 ++--
 code/cgame/cg_view.c |   3 +-
 code/client/cl_cin.c |  16 +-
 code/client/cl_main.c|  37 +++-
 code/game/ai_dmq3.c  |   7 +-
 code/game/g_active.c |   7 +-
 code/game/g_bot.c| 212 ---
 code/game/g_client.c |  40 ++--
 code/game/g_cmds.c   |   6 +-
 code/game/g_local.h  |   4 +-
 code/game/g_main.c   |   4 +-
 code/game/g_session.c|  27 ++-
 code/game/g_team.c   |  80 +++
 code/q3_ui/ui_atoms.c|  12 +-
 code/q3_ui/ui_main.c |   7 +-
 code/q3_ui/ui_servers2.c |  99 -
 code/q3_ui/ui_startserver.c  |   4 +
 code/qcommon/vm_armv7l.c |  28 ++-
 code/renderercommon/qgl.h| 127 ++-
 code/renderercommon/tr_common.h  |   2 +-
 code/renderergl1/tr_animation.c  |   4 +-
 code/renderergl1/tr_image.c  |  36 ++--
 code/renderergl1/tr_init.c   |   2 +-
 code/renderergl1/tr_local.h  |   8 +-
 code/renderergl1/tr_mesh.c   |   4 +-
 code/renderergl1/tr_model_iqm.c  |   4 +-
 code/renderergl1/tr_shader.c |  10 +
 code/renderergl2/glsl/dlight_fp.glsl |  22 +-
 code/renderergl2/glsl/generic_fp.glsl|  23 +-
 code/renderergl2/glsl/lightall_fp.glsl   |  21 +-
 code/renderergl2/glsl/pshadow_fp.glsl|  44 ++--
 code/renderergl2/glsl/shadowmask_fp.glsl |  28 +--
 code/renderergl2/tr_animation.c  |   4 +-
 code/renderergl2/tr_backend.c| 351 +++
 code/renderergl2/tr_dsa.c|  46 ++--
 code/renderergl2/tr_extensions.c |  99 +++--
 code/renderergl2/tr_fbo.c| 128 ++-
 code/renderergl2/tr_glsl.c   |  28 +--
 code/renderergl2/tr_image.c  |  55 +++--
 code/renderergl2/tr_init.c   |  27 ++-
 code/renderergl2/tr_light.c  |   1 -
 code/renderergl2/tr_local.h  |  23 +-
 code/renderergl2/tr_main.c   |   2 +-
 code/renderergl2/tr_mesh.c   |  30 ++-
 code/renderergl2/tr_model_iqm.c  |   7 +-
 code/renderergl2/tr_scene.c  |   2 +-
 code/renderergl2/tr_shade.c  |  24 +++
 code/renderergl2/tr_shader.c |  14 +-
 code/renderergl2/tr_shadows.c|   4 +-
 code/renderergl2/tr_sky.c|   2 +
 code/renderergl2/tr_surface.c|  38 +---
 code/renderergl2/tr_world.c  |   2 -
 code/sdl/sdl_glimp.c |  51 -
 code/sys/sys_main.c  |   3 +-
 code/ui/ui_atoms.c   |  10 +-
 code/ui/ui_main.c|  86 +---
 code/ui/ui_shared.c  |   8 +-
 misc/linux/start_server.sh   |   8 +-
 misc/osx/start_server.sh |   8 +-
 opengl2-readme.md|  21 +-
 64 files changed, 1095 insertions(+), 1008 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/50: Fix score bonus for defending the flag carrier in CTF

[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 c8db6c55e5f2dbf9ee908e6d09bb706281bf5c57
Author: Zack Middleton 
Date:   Fri Jul 14 15:43:44 2017 -0500

Fix score bonus for defending the flag carrier in CTF

Fix copy-paste error in the original Quake 3 code. The wrong values
are used for v1 and v2. v2 was previously set to distance of attacker
to flag base; which should be handled already.

The game now gives defense score bonus to player when they frag an
enemy near their team's flag carrier while the player is more than
1000 units from the flag carrier.

This may also fix not giving defense bonus when near carrier due to
checking if carrier and enemy (instead of attacker) are in PVS.

Found by @Razish.
---
 code/game/g_team.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_team.c b/code/game/g_team.c
index 7e0e90b..e736a4a 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -462,7 +462,7 @@ void Team_FragBonuses(gentity_t *targ, gentity_t 
*inflictor, gentity_t *attacker
 
if (carrier && carrier != attacker) {
VectorSubtract(targ->r.currentOrigin, carrier->r.currentOrigin, 
v1);
-   VectorSubtract(attacker->r.currentOrigin, 
carrier->r.currentOrigin, v1);
+   VectorSubtract(attacker->r.currentOrigin, 
carrier->r.currentOrigin, v2);
 
if ( ( ( VectorLength(v1) < CTF_ATTACKER_PROTECT_RADIUS &&
trap_InPVS(carrier->r.currentOrigin, 
targ->r.currentOrigin ) ) ||

-- 
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/50: Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash

[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 fa1549d4576c562600f16b0fdd1300812727fadd
Author: Noah Metzger 
Date:   Fri Jul 14 08:23:38 2017 -0500

Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash
---
 code/sys/sys_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index fc1ff4a..586e37a 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -744,11 +744,10 @@ int main( int argc, char **argv )
Q_strcat( commandLine, sizeof( commandLine ), " " );
}
 
+   CON_Init( );
Com_Init( commandLine );
NET_Init( );
 
-   CON_Init( );
-
signal( SIGILL, Sys_SigHandler );
signal( SIGFPE, Sys_SigHandler );
signal( SIGSEGV, Sys_SigHandler );

-- 
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] 39/50: OpenGL2: "Fix" cg_shadows 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 6f1712dafe2d32d424d110e20218532c41d16388
Author: SmileTheory 
Date:   Fri Jul 14 16:15:02 2017 -0700

OpenGL2: "Fix" cg_shadows 4.
---
 code/renderergl2/glsl/pshadow_fp.glsl | 44 ++-
 code/renderergl2/tr_backend.c | 18 +++---
 code/renderergl2/tr_fbo.c |  6 ++---
 code/renderergl2/tr_image.c   |  9 ---
 code/renderergl2/tr_main.c|  2 +-
 5 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/code/renderergl2/glsl/pshadow_fp.glsl 
b/code/renderergl2/glsl/pshadow_fp.glsl
index b152971..c196f48 100644
--- a/code/renderergl2/glsl/pshadow_fp.glsl
+++ b/code/renderergl2/glsl/pshadow_fp.glsl
@@ -8,12 +8,6 @@ uniform float u_LightRadius;
 varying vec3  var_Position;
 varying vec3  var_Normal;
 
-float sampleDistMap(sampler2D texMap, vec2 uv, float scale)
-{
-   vec3 distv = texture2D(texMap, uv).xyz;
-   return dot(distv, vec3(1.0 / (256.0 * 256.0), 1.0 / 256.0, 1.0)) * 
scale;
-}
-
 void main()
 {
vec3 lightToPos = var_Position - u_LightOrigin.xyz;
@@ -57,42 +51,28 @@ void main()
 #endif
 
intensity *= fade;
-#if defined(USE_PCF)
-   float part;
-   
-   dist = sampleDistMap(u_ShadowMap, st + vec2(-1.0/512.0, -1.0/512.0), 
u_LightRadius);
-   part =  max(sign(lightDist - dist), 0.0);
-
-   dist = sampleDistMap(u_ShadowMap, st + vec2( 1.0/512.0, -1.0/512.0), 
u_LightRadius);
-   part += max(sign(lightDist - dist), 0.0);
 
-   dist = sampleDistMap(u_ShadowMap, st + vec2(-1.0/512.0,  1.0/512.0), 
u_LightRadius);
-   part += max(sign(lightDist - dist), 0.0);
-
-   dist = sampleDistMap(u_ShadowMap, st + vec2( 1.0/512.0,  1.0/512.0), 
u_LightRadius);
-   part += max(sign(lightDist - dist), 0.0);
+   float part;
+#if defined(USE_PCF)
+   part  = float(texture2D(u_ShadowMap, st + vec2(-1.0/512.0, 
-1.0/512.0)).r != 1.0);
+   part += float(texture2D(u_ShadowMap, st + vec2( 1.0/512.0, 
-1.0/512.0)).r != 1.0);
+   part += float(texture2D(u_ShadowMap, st + vec2(-1.0/512.0,  
1.0/512.0)).r != 1.0);
+   part += float(texture2D(u_ShadowMap, st + vec2( 1.0/512.0,  
1.0/512.0)).r != 1.0);
+#else
+   part  = float(texture2D(u_ShadowMap, st).r != 1.0);
+#endif
 
-  #if defined(USE_DISCARD)
if (part <= 0.0)
{
discard;
}
-  #endif
 
+#if defined(USE_PCF)
intensity *= part * 0.25;
 #else
-   dist = sampleDistMap(u_ShadowMap, st, u_LightRadius);
-
-  #if defined(USE_DISCARD)
-   if (lightDist - dist <= 0.0)
-   {
-   discard;
-   }
-  #endif
-   
-   intensity *= max(sign(lightDist - dist), 0.0);
+   intensity *= part;
 #endif
-   
+
gl_FragColor.rgb = vec3(0);
gl_FragColor.a = clamp(intensity, 0.0, 0.75);
 }
diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index dc27cdd..39e9014 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -1604,26 +1604,26 @@ const void *RB_PostProcess(const void *data)
if (0 && r_sunlightMode->integer)
{
ivec4_t dstBox;
-   VectorSet4(dstBox, 0, 0, 128, 128);
+   VectorSet4(dstBox, 0, glConfig.vidHeight - 128, 128, 128);
FBO_BlitFromTexture(tr.sunShadowDepthImage[0], NULL, NULL, 
NULL, dstBox, NULL, NULL, 0);
-   VectorSet4(dstBox, 128, 0, 128, 128);
+   VectorSet4(dstBox, 128, glConfig.vidHeight - 128, 128, 128);
FBO_BlitFromTexture(tr.sunShadowDepthImage[1], NULL, NULL, 
NULL, dstBox, NULL, NULL, 0);
-   VectorSet4(dstBox, 256, 0, 128, 128);
+   VectorSet4(dstBox, 256, glConfig.vidHeight - 128, 128, 128);
FBO_BlitFromTexture(tr.sunShadowDepthImage[2], NULL, NULL, 
NULL, dstBox, NULL, NULL, 0);
-   VectorSet4(dstBox, 384, 0, 128, 128);
+   VectorSet4(dstBox, 384, glConfig.vidHeight - 128, 128, 128);
FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, 
NULL, dstBox, NULL, NULL, 0);
}
 
-   if (0 && r_shadows->integer == 4)
+   if (1 && r_shadows->integer == 4)
{
ivec4_t dstBox;
-   VectorSet4(dstBox, 0, glConfig.vidHeight - 128, 128, 128);
+   VectorSet4(dstBox, 512 + 0, glConfig.vidHeight - 128, 128, 128);
FBO_BlitFromTexture(tr.pshadowMaps[0], NULL, NULL, NULL, 
dstBox, NULL, NULL, 0);
-   VectorSet4(dstBox, 128, glConfig.vidHeight - 128, 128, 128);
+   VectorSet4(dstBox, 512 + 128, glConfig.vidHeight - 128, 128, 
128);
FBO_BlitFromTexture(tr.pshadowMaps[1], NULL, NULL, NULL, 
dstBox, NULL, NULL, 0);
-   VectorSet4(dstBox, 256, 

[ioquake3] 01/01: pristine-tar data for ioquake3_1.36+u20170720+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 c52e03e19f2b8fddab0daf0dcacf6a451bb69210
Author: Simon McVittie 
Date:   Sun Jul 23 22:36:24 2017 +0100

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

diff --git a/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.delta 
b/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.delta
new file mode 100644
index 000..2976783
Binary files /dev/null and b/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.delta 
differ
diff --git a/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.id 
b/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.id
new file mode 100644
index 000..ec9450c
--- /dev/null
+++ b/ioquake3_1.36+u20170720+dfsg1.orig.tar.xz.id
@@ -0,0 +1 @@
+8f71d0b9a0d8fe940766f759f6fd2944cd9c76af

-- 
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/50: Add score bonus for defending the flag carrier in 1 Flag CTF

[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 5f2e4a03c56f916a32c0364ca71c0ef9e004299a
Author: Zack Middleton 
Date:   Fri Jul 14 17:38:22 2017 -0500

Add score bonus for defending the flag carrier in 1 Flag CTF

Set flag_pw to neutral flag instead of using CTF value for red or
blue flag so that flag carrier is detected correctly.
---
 code/game/g_team.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/code/game/g_team.c b/code/game/g_team.c
index de81e52..0f5a34c 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -300,6 +300,7 @@ void Team_FragBonuses(gentity_t *targ, gentity_t 
*inflictor, gentity_t *attacker
 
 #ifdef MISSIONPACK
if (g_gametype.integer == GT_1FCTF) {
+   flag_pw = PW_NEUTRALFLAG;
enemy_flag_pw = PW_NEUTRALFLAG;
} 
 #endif
@@ -486,6 +487,12 @@ void Team_CheckHurtCarrier(gentity_t *targ, gentity_t 
*attacker)
else
flag_pw = PW_REDFLAG;
 
+#ifdef MISSIONPACK
+   if (g_gametype.integer == GT_1FCTF) {
+   flag_pw = PW_NEUTRALFLAG;
+   }
+#endif
+
// flags
if (targ->client->ps.powerups[flag_pw] &&
targ->client->sess.sessionTeam != 
attacker->client->sess.sessionTeam)

-- 
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/50: Restore not giving defense score bonus to flag carrier

[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 13831f9569f08b18e6762eeab0ae39c753ed2f2f
Author: Zack Middleton 
Date:   Fri Jul 14 17:06:22 2017 -0500

Restore not giving defense score bonus to flag carrier

The Team Arena code for giving defense bonus for fragging player
who recently damaged a skull carrier unintentionally applied to
the flag carrier.

The skull carrier case would of been handled by the flag carrier
block above it. However, Harvest mode doesn't call
Team_CheckHurtCarrier() so the skull carrier defense bonus does
not work.

This restores the pre-Team Arena behavior of not giving defense
score bonus to flag carrier.
---
 code/game/g_team.c | 17 -
 1 file changed, 17 deletions(-)

diff --git a/code/game/g_team.c b/code/game/g_team.c
index e736a4a..de81e52 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -365,23 +365,6 @@ void Team_FragBonuses(gentity_t *targ, gentity_t 
*inflictor, gentity_t *attacker
return;
}
 
-   if (targ->client->pers.teamState.lasthurtcarrier &&
-   level.time - targ->client->pers.teamState.lasthurtcarrier < 
CTF_CARRIER_DANGER_PROTECT_TIMEOUT) {
-   // attacker is on the same team as the skull carrier and
-   AddScore(attacker, targ->r.currentOrigin, 
CTF_CARRIER_DANGER_PROTECT_BONUS);
-
-   attacker->client->pers.teamState.carrierdefense++;
-   targ->client->pers.teamState.lasthurtcarrier = 0;
-
-   attacker->client->ps.persistant[PERS_DEFEND_COUNT]++;
-   // add the sprite over the player's head
-   attacker->client->ps.eFlags &= ~(EF_AWARD_IMPRESSIVE | 
EF_AWARD_EXCELLENT | EF_AWARD_GAUNTLET | EF_AWARD_ASSIST | EF_AWARD_DEFEND | 
EF_AWARD_CAP );
-   attacker->client->ps.eFlags |= EF_AWARD_DEFEND;
-   attacker->client->rewardTime = level.time + REWARD_SPRITE_TIME;
-
-   return;
-   }
-
// flag and flag carrier area defense bonuses
 
// we have to find the flag and carrier entities

-- 
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/50: Escape quotes for sv_dlURL in shell so it doesn't become "http:"

[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 67dace6c209c91fac5861846364e62c1c67aab77
Author: Zack Middleton 
Date:   Thu Jul 20 22:37:36 2017 -0500

Escape quotes for sv_dlURL in shell so it doesn't become "http:"

q3ded +set sv_dlURL "http://example.org;

The shell removes the quotes but makes the content be a single argument
for progam args. Quake 3 concatenates all the program args and splits
lines at + or newlines. Then Quake 3 parses them using a tokenizer
that skips unquoted C comments beginning with //. This results in
the cvar being set to "http:".

Escape the quotes so they are passed to the program and the tokenizer
knows not to skip C comments.

q3ded +set sv_dlURL \"http://example.org\;
---
 misc/linux/start_server.sh | 8 ++--
 misc/osx/start_server.sh   | 8 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/misc/linux/start_server.sh b/misc/linux/start_server.sh
index da98007..c68292e 100644
--- a/misc/linux/start_server.sh
+++ b/misc/linux/start_server.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-echo "Edit this script to change the path to ioquake3's dedicated server 
executable and which binary if you aren't on x86_64.\n Set the sv_dlURL setting 
to a url like http://yoursite.com/ioquake3_path for ioquake3 clients to 
download extra data"
-~/ioquake3/ioq3ded.x86_64 +set dedicated 2 +set sv_allowDownload 1 +set 
sv_dlURL "" +set com_hunkmegs 64 "$@"
+echo "Edit this script to change the path to ioquake3's dedicated server 
executable and which binary if you aren't on x86_64."
+echo "Set the sv_dlURL setting to a url like http://yoursite.com/ioquake3_path 
for ioquake3 clients to download extra data."
+
+# sv_dlURL needs to have quotes escaped like 
\"http://yoursite.com/ioquake3_path\; or it will be set to "http:" in-game.
+
+~/ioquake3/ioq3ded.x86_64 +set dedicated 2 +set sv_allowDownload 1 +set 
sv_dlURL \"\" +set com_hunkmegs 64 "$@"
diff --git a/misc/osx/start_server.sh b/misc/osx/start_server.sh
index 66a295f..d9154b2 100644
--- a/misc/osx/start_server.sh
+++ b/misc/osx/start_server.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-echo "Edit this script to change the path to ioquake3's dedicated server 
executable.\n Set the sv_dlURL setting to a url like 
http://yoursite.com/ioquake3_path for ioquake3 clients to download extra data"
-/Applications/ioquake3/ioquake3.app/Contents/MacOS/ioq3ded +set dedicated 2 
+set sv_allowDownload 1 +set sv_dlURL "" +set com_hunkmegs 64 "$@"
+echo "Edit this script to change the path to ioquake3's dedicated server 
executable."
+echo "Set the sv_dlURL setting to a url like http://yoursite.com/ioquake3_path 
for ioquake3 clients to download extra data."
+
+# sv_dlURL needs to have quotes escaped like 
\"http://yoursite.com/ioquake3_path\; or it will be set to "http:" in-game.
+
+/Applications/ioquake3/ioquake3.app/Contents/MacOS/ioq3ded +set dedicated 2 
+set sv_allowDownload 1 +set sv_dlURL \"\" +set com_hunkmegs 64 "$@"

-- 
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/50: 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 8c7a839902a5a57df7e80b2dfdfee954811f2cc6
Author: Simon McVittie 
Date:   Sun Jul 23 22:37:50 2017 +0100

New upstream snapshot
---
 debian/changelog | 3 ++-
 debian/rules | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91bdd33..b256567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ioquake3 (1.36+u20170611+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20170720+dfsg1-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot
   * debian/apparmor.d: allow even more device enumeration
   * Declare compliance with Debian Policy 4.0.0
 
diff --git a/debian/rules b/debian/rules
index 3b736bb..84d6282 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,10 +91,10 @@ ORIG_SOURCE = ioquake3
 ORIG_REPO ?= https://github.com/ioquake/ioq3
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = fd3b58b967a89dde37495561f722db7b33e45404
+ORIG_REV = 67dace6c209c91fac5861846364e62c1c67aab77
 # 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 = 20170611
+ORIG_DATE = 20170720
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)

-- 
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/50: OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow views.

[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 6a77f4e3634af9bec0693ab29422c52d95b43062
Author: SmileTheory 
Date:   Fri Jul 14 15:42:41 2017 -0700

OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow views.
---
 code/renderergl2/tr_backend.c | 305 ++
 1 file changed, 162 insertions(+), 143 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index 061d9d5..dc27cdd 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -878,6 +878,7 @@ RB_DrawSurfs
 */
 const void *RB_DrawSurfs( const void *data ) {
const drawSurfsCommand_t*cmd;
+   qboolean isShadowView;
 
// finish any 2D drawing if needed
if ( tess.numIndexes ) {
@@ -889,6 +890,8 @@ const void  *RB_DrawSurfs( const void *data ) {
backEnd.refdef = cmd->refdef;
backEnd.viewParms = cmd->viewParms;
 
+   isShadowView = !!(backEnd.viewParms.flags & VPF_DEPTHSHADOW);
+
// clear the z buffer, set the modelview, etc
RB_BeginDrawingView ();
 
@@ -897,7 +900,7 @@ const void  *RB_DrawSurfs( const void *data ) {
qglEnable(GL_DEPTH_CLAMP);
}
 
-   if (glRefConfig.framebufferObject && !(backEnd.refdef.rdflags & 
RDF_NOWORLDMODEL) && (r_depthPrepass->integer || (backEnd.viewParms.flags & 
VPF_DEPTHSHADOW)))
+   if (glRefConfig.framebufferObject && !(backEnd.refdef.rdflags & 
RDF_NOWORLDMODEL) && (r_depthPrepass->integer || isShadowView))
{
FBO_t *oldFbo = glState.currentFBO;
vec4_t viewInfo;
@@ -910,205 +913,208 @@ const void  *RB_DrawSurfs( const void *data ) {
qglColorMask(!backEnd.colorMask[0], !backEnd.colorMask[1], 
!backEnd.colorMask[2], !backEnd.colorMask[3]);
backEnd.depthFill = qfalse;
 
-   if (tr.msaaResolveFbo)
-   {
-   // If we're using multisampling, resolve the depth first
-   FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, 
NULL, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
-   }
-   else if (tr.renderFbo == NULL && tr.renderDepthImage)
+   if (!isShadowView)
{
-   // If we're rendering directly to the screen, copy the 
depth to a texture
-   // This is incredibly slow on Intel Graphics, so just 
skip it on there
-   if (!glRefConfig.intelGraphics)
-   
qglCopyTextureSubImage2DEXT(tr.renderDepthImage->texnum, GL_TEXTURE_2D, 0, 0, 
0, 0, 0, glConfig.vidWidth, glConfig.vidHeight);
-   }
+   if (tr.msaaResolveFbo)
+   {
+   // If we're using multisampling, resolve the 
depth first
+   FBO_FastBlit(tr.renderFbo, NULL, 
tr.msaaResolveFbo, NULL, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+   }
+   else if (tr.renderFbo == NULL && tr.renderDepthImage)
+   {
+   // If we're rendering directly to the screen, 
copy the depth to a texture
+   // This is incredibly slow on Intel Graphics, 
so just skip it on there
+   if (!glRefConfig.intelGraphics)
+   
qglCopyTextureSubImage2DEXT(tr.renderDepthImage->texnum, GL_TEXTURE_2D, 0, 0, 
0, 0, 0, glConfig.vidWidth, glConfig.vidHeight);
+   }
 
-   if (tr.hdrDepthFbo)
-   {
-   // need the depth in a texture we can do GL_LINEAR 
sampling on, so copy it to an HDR image
-   vec4_t srcTexCoords;
+   if (tr.hdrDepthFbo)
+   {
+   // need the depth in a texture we can do 
GL_LINEAR sampling on, so copy it to an HDR image
+   vec4_t srcTexCoords;
 
-   VectorSet4(srcTexCoords, 0.0f, 0.0f, 1.0f, 1.0f);
+   VectorSet4(srcTexCoords, 0.0f, 0.0f, 1.0f, 
1.0f);
 
-   FBO_BlitFromTexture(tr.renderDepthImage, srcTexCoords, 
NULL, tr.hdrDepthFbo, NULL, NULL, NULL, 0);
-   }
+   FBO_BlitFromTexture(tr.renderDepthImage, 
srcTexCoords, NULL, tr.hdrDepthFbo, NULL, NULL, NULL, 0);
+   }
 
-   if (r_sunlightMode->integer && backEnd.viewParms.flags & 
VPF_USESUNLIGHT)
-   {
-   vec4_t quadVerts[4];
-   vec2_t texCoords[4];
-   vec4_t box;
+   if (r_sunlightMode->integer && backEnd.viewParms.flags 
& VPF_USESUNLIGHT)
+   {
+  

[ioquake3] 40/50: whoops, left a bit of debugging enabled

[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 786f6fc525b7cd3e76dd721396566de32f4a0085
Author: SmileTheory 
Date:   Fri Jul 14 16:26:41 2017 -0700

whoops, left a bit of debugging enabled
---
 code/renderergl2/tr_backend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index 39e9014..d6ff122 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -1614,7 +1614,7 @@ const void *RB_PostProcess(const void *data)
FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, 
NULL, dstBox, NULL, NULL, 0);
}
 
-   if (1 && r_shadows->integer == 4)
+   if (0 && r_shadows->integer == 4)
{
ivec4_t dstBox;
VectorSet4(dstBox, 512 + 0, glConfig.vidHeight - 128, 128, 128);

-- 
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/50: Make 'globalservers 0' fetch all masters

[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 9f239d647b5e7d21e437ad6f012af436b30bb456
Author: Zack Middleton 
Date:   Thu Jul 20 15:39:51 2017 -0500

Make 'globalservers 0' fetch all masters

This commit fixes the vanilla Q3 UI VMs not displaying a server list
when id Software's master server is down.

Originally master 0 for the globalservers command was Internet and
master 1 was MPlayer (defunct). In 2008 ioquake3 changed it so that
master 0 to 4 were five separate master servers with no affect on
original Quake3/Team Arena UI VMs; they continued to get the server
list from master.quake3arena.com.

id Software's master server (master.quake3arena.com) goes down
occasionally. Using ioq3's UI VM additional master servers can be
accessed but players using the original UI VMs are unable to get a
server list.

In order to fix the original UI VMs in Quake3/Team Arena's pk3s this
commit makes 'globalservers 0' fetch all master servers. So players
get a combined list of id Software's and ioquake3's master list. Or
just ioquake3's list if id Software's master is down.

Getting lists from individual master servers using globalservers has
changed from 0 through 4 to 1 through 5 to accommodate using 0 for
other purposes. This commit modifies ioq3's UI code to support the new
values for globalservers command.

A side affect of these changes is that UI VMs based on ioq3 since 2008
will have Internet1 fetch all master servers and Internet2 request
sv_master1 instead of sv_master2 and so on. It may be worth noting that
getting server list from masters 3-5 could not be done using ioq3's UI
before 2011.
---
 code/client/cl_main.c| 37 -
 code/q3_ui/ui_servers2.c | 44 
 code/ui/ui_main.c| 35 +++
 3 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index b0712a3..506940b 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -2471,7 +2471,7 @@ void CL_ServersResponsePacket( const netadr_t* from, 
msg_t *msg, qboolean extend
byte*   buffptr;
byte*   buffend;

-   Com_Printf("CL_ServersResponsePacket\n");
+   Com_Printf("CL_ServersResponsePacket from %s\n", 
NET_AdrToStringwPort(*from));
 
if (cls.numglobalservers == -1) {
// state to detect lack of servers or lack of response
@@ -4165,6 +4165,10 @@ void CL_LocalServers_f( void ) {
 /*
 ==
 CL_GlobalServers_f
+
+Originally master 0 was Internet and master 1 was MPlayer.
+ioquake3 2008; added support for requesting five separate master servers using 
0-4.
+ioquake3 2017; made master 0 fetch all master servers and 1-5 request a single 
master server.
 ==
 */
 void CL_GlobalServers_f( void ) {
@@ -4172,13 +4176,36 @@ void CL_GlobalServers_f( void ) {
int count, i, masterNum;
charcommand[1024], *masteraddress;

-   if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || 
masterNum > MAX_MASTER_SERVERS - 1)
+   if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || 
masterNum > MAX_MASTER_SERVERS)
{
-   Com_Printf("usage: globalservers   
[keywords]\n", MAX_MASTER_SERVERS - 1);
+   Com_Printf("usage: globalservers   
[keywords]\n", MAX_MASTER_SERVERS);
return; 
}
 
-   sprintf(command, "sv_master%d", masterNum + 1);
+   // request from all master servers
+   if ( masterNum == 0 ) {
+   int numAddress = 0;
+
+   for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
+   sprintf(command, "sv_master%d", i);
+   masteraddress = Cvar_VariableString(command);
+
+   if(!*masteraddress)
+   continue;
+
+   numAddress++;
+
+   Com_sprintf(command, sizeof(command), "globalservers %d 
%s %s\n", i, Cmd_Argv(2), Cmd_ArgsFrom(3));
+   Cbuf_AddText(command);
+   }
+
+   if ( !numAddress ) {
+   Com_Printf( "CL_GlobalServers_f: Error: No master 
server addresses.\n");
+   }
+   return;
+   }
+
+   sprintf(command, "sv_master%d", masterNum);
masteraddress = Cvar_VariableString(command);

if(!*masteraddress)
@@ -4200,7 +4227,7 @@ void CL_GlobalServers_f( void ) {
else if(i == 2)
to.port = BigShort(PORT_MASTER);
 
-   Com_Printf("Requesting servers from master %s...\n", 

[ioquake3] 29/50: Add warnings for animMap and videoMap shader keywords

[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 4dffc52c1dac517073123e29d19cc7c4b9452541
Author: Zack Middleton 
Date:   Sun Jul 2 16:57:49 2017 -0500

Add warnings for animMap and videoMap shader keywords
---
 code/renderergl1/tr_shader.c | 10 ++
 code/renderergl2/tr_shader.c | 10 ++
 2 files changed, 20 insertions(+)

diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index c931326..c1d9628 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -687,6 +687,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
//
else if ( !Q_stricmp( token, "animMap" ) )
{
+   int totalImages = 0;
+
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
@@ -721,6 +723,12 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
}
stage->bundle[0].numImageAnimations++;
}
+   totalImages++;
+   }
+
+   if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
+   ri.Printf( PRINT_WARNING, "WARNING: ignoring 
excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
+   totalImages, 
MAX_IMAGE_ANIMATIONS, shader.name );
}
}
else if ( !Q_stricmp( token, "videoMap" ) )
@@ -735,6 +743,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
if (stage->bundle[0].videoMapHandle != -1) {
stage->bundle[0].isVideoMap = qtrue;
stage->bundle[0].image[0] = 
tr.scratchImage[stage->bundle[0].videoMapHandle];
+   } else {
+   ri.Printf( PRINT_WARNING, "WARNING: could not 
load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
}
}
//
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index 574cfb1..1df374e 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -744,6 +744,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
//
else if ( !Q_stricmp( token, "animMap" ) )
{
+   int totalImages = 0;
+
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
@@ -778,6 +780,12 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
}
stage->bundle[0].numImageAnimations++;
}
+   totalImages++;
+   }
+
+   if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
+   ri.Printf( PRINT_WARNING, "WARNING: ignoring 
excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
+   totalImages, 
MAX_IMAGE_ANIMATIONS, shader.name );
}
}
else if ( !Q_stricmp( token, "videoMap" ) )
@@ -792,6 +800,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text )
if (stage->bundle[0].videoMapHandle != -1) {
stage->bundle[0].isVideoMap = qtrue;
stage->bundle[0].image[0] = 
tr.scratchImage[stage->bundle[0].videoMapHandle];
+   } else {
+   ri.Printf( PRINT_WARNING, "WARNING: could not 
load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
}
}
//

-- 
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/50: OpenGL2: Remove GLSL_ValidateProgram().

[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 a4c09236b1cb7fe5ccd70126b6f872f51c84fdb6
Author: SmileTheory 
Date:   Thu Jul 13 12:10:09 2017 -0700

OpenGL2: Remove GLSL_ValidateProgram().


https://stackoverflow.com/questions/39761456/why-does-glvalidateprogram-fail-when-no-vao-is-bound
---
 code/renderergl2/tr_glsl.c | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c
index 9f01f22..70ad816 100644
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@@ -487,20 +487,6 @@ static void GLSL_LinkProgram(GLuint program)
}
 }
 
-static void GLSL_ValidateProgram(GLuint program)
-{
-   GLint   validated;
-
-   qglValidateProgram(program);
-
-   qglGetProgramiv(program, GL_VALIDATE_STATUS, );
-   if(!validated)
-   {
-   GLSL_PrintLog(program, GLSL_PRINTLOG_PROGRAM_INFO, qfalse);
-   ri.Error(ERR_DROP, "shaders failed to validate");
-   }
-}
-
 static void GLSL_ShowProgramUniforms(GLuint program)
 {
int i, count, size;
@@ -695,7 +681,6 @@ void GLSL_InitUniforms(shaderProgram_t *program)
 
 void GLSL_FinishGPUShader(shaderProgram_t *program)
 {
-   GLSL_ValidateProgram(program->program);
GLSL_ShowProgramUniforms(program->program);
GL_CheckErrors();
 }

-- 
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/50: Fix set-but-not-used variable warnings in vm_armv7l.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 7c252066a3bb3b33e0a9f514a1085333c1fca9f5
Author: Zack Middleton 
Date:   Sat Jul 8 16:46:41 2017 -0500

Fix set-but-not-used variable warnings in vm_armv7l.c

offsidx and const_value were set but not used.
---
 code/qcommon/vm_armv7l.c | 28 
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/code/qcommon/vm_armv7l.c b/code/qcommon/vm_armv7l.c
index dd63f5c..8f2bd8c 100644
--- a/code/qcommon/vm_armv7l.c
+++ b/code/qcommon/vm_armv7l.c
@@ -599,11 +599,11 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
unsigned char *code;
int i_count, pc = 0;
int pass;
-   int codeoffsets[1024];
+   int codeoffsets[2]; // was 1024 but it's only used for OFF_CODE and 
OFF_IMMEDIATES
 
 #define j_rel(x) (pass?_j_rel(x, pc):0xBAD)
 #define OFFSET(i) (pass?(j_rel(codeoffsets[i]-vm->codeLength)):(0xF00F))
-#define new_offset() (offsidx++)
+//#define new_offset() (offsidx++)
 #define get_offset(i) (codeoffsets[i])
 #define save_offset(i) (codeoffsets[i] = vm->codeLength)
 #define OFF_CODE 0
@@ -616,10 +616,12 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
 
for (pass = 0; pass < 2; ++pass) {
 
-   int offsidx = 0;
+// int offsidx = 0;
 
+#ifdef CONST_OPTIMIZE
// const optimization
unsigned got_const = 0, const_value = 0;
+#endif
 
if(pass)
{
@@ -656,7 +658,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit(BKPT(0));
 
save_offset(OFF_CODE);
-   offsidx = OFF_IMMEDIATES+1;
+// offsidx = OFF_IMMEDIATES+1;
 
code = (unsigned char *) header + header->codeOffset;
pc = 0;
@@ -744,9 +746,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit_MOVR0i(i_count);
emit(STRa(R0, rDATABASE, rPSTACK));  // 
dataBase[pstack] = r0
 #endif
-   if (got_const) {
+#ifdef CONST_OPTIMIZE
+   if (got_const)
+   {
NOTIMPL(op);
-   } else {
+   }
+   else
+#endif
+   {
static int bytes_to_skip = -1;
static unsigned start_block = -1;
MAYBE_EMIT_CONST();
@@ -803,9 +810,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
break;
 
case OP_JUMP:
-   if(got_const) {
+#ifdef CONST_OPTIMIZE
+   if (got_const)
+   {
NOTIMPL(op);
-   } else {
+   }
+   else
+#endif
+   {
emit(LDRTxi(R0, rOPSTACK, 4));  // r0 = 
*opstack; rOPSTACK -= 4
CHECK_JUMP;
emit_MOVRxi(R1, 
(unsigned)vm->instructionPointers);

-- 
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] 34/50: Fix more maybe-uninitialized warnings in opusfile

[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 e78da55a753d55b6e0f5e6de88d7f8f055031a8f
Author: Zack Middleton 
Date:   Sun Jul 9 12:58:52 2017 -0500

Fix more maybe-uninitialized warnings in opusfile
---
 code/opusfile-0.8/src/opusfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/opusfile-0.8/src/opusfile.c b/code/opusfile-0.8/src/opusfile.c
index 7c3691b..53bf4dd 100644
--- a/code/opusfile-0.8/src/opusfile.c
+++ b/code/opusfile-0.8/src/opusfile.c
@@ -2193,7 +2193,7 @@ static int op_pcm_seek_page(OggOpusFile *_of,
   ogg_int64_tpcm_start;
   ogg_int64_tpcm_end;
   ogg_int64_tbest_gp;
-  ogg_int64_tdiff;
+  ogg_int64_tdiff=0;
   ogg_uint32_t   serialno;
   opus_int32 pre_skip;
   opus_int64 begin;
@@ -2331,7 +2331,7 @@ static int op_pcm_seek_page(OggOpusFile *_of,
   d2=end-begin>>1;
   if(force_bisect)bisect=begin+(end-begin>>1);
   else{
-ogg_int64_t diff2;
+ogg_int64_t diff2=0;
 OP_ALWAYS_TRUE(!op_granpos_diff(,_target_gp,pcm_start));
 OP_ALWAYS_TRUE(!op_granpos_diff(,pcm_end,pcm_start));
 /*Take a (pretty decent) guess.*/

-- 
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/50: Fix misleading-indentation warnings in cl_cin.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 51ca4d35ea33b722d0084d76b9d2782f3a5fa37f
Author: Zack Middleton 
Date:   Sun Jul 9 13:09:06 2017 -0500

Fix misleading-indentation warnings in cl_cin.c
---
 code/client/cl_cin.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c
index 327e5c3..73eecd4 100644
--- a/code/client/cl_cin.c
+++ b/code/client/cl_cin.c
@@ -577,8 +577,12 @@ static unsigned short yuv_to_rgb( long y, long u, long v )
g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 8;
b = (YY + ROQ_UB_tab[u]) >> 9;

-   if (r<0) r = 0; if (g<0) g = 0; if (b<0) b = 0;
-   if (r > 31) r = 31; if (g > 63) g = 63; if (b > 31) b = 31;
+   if (r<0) r = 0;
+   if (g<0) g = 0;
+   if (b<0) b = 0;
+   if (r > 31) r = 31;
+   if (g > 63) g = 63;
+   if (b > 31) b = 31;
 
return (unsigned short)((r<<11)+(g<<5)+(b));
 }
@@ -598,8 +602,12 @@ static unsigned int yuv_to_rgb24( long y, long u, long v )
g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 6;
b = (YY + ROQ_UB_tab[u]) >> 6;

-   if (r<0) r = 0; if (g<0) g = 0; if (b<0) b = 0;
-   if (r > 255) r = 255; if (g > 255) g = 255; if (b > 255) b = 255;
+   if (r<0) r = 0;
+   if (g<0) g = 0;
+   if (b<0) b = 0;
+   if (r > 255) r = 255;
+   if (g > 255) g = 255;
+   if (b > 255) b = 255;

return LittleLong ((r)|(g<<8)|(b<<16)|(255<<24));
 }

-- 
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/50: OpenGL2: Use an OpenGL 3.2 core context if available.

[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 d549b642bcdc32b6f2c0b2207cb80060993916f7
Author: SmileTheory 
Date:   Thu Jul 13 12:03:10 2017 -0700

OpenGL2: Use an OpenGL 3.2 core context if available.
---
 code/renderercommon/qgl.h| 127 +--
 code/renderercommon/tr_common.h  |   2 +-
 code/renderergl1/tr_init.c   |   2 +-
 code/renderergl2/glsl/dlight_fp.glsl |  22 +-
 code/renderergl2/glsl/generic_fp.glsl|  23 +-
 code/renderergl2/glsl/lightall_fp.glsl   |  21 -
 code/renderergl2/glsl/shadowmask_fp.glsl |  28 +++
 code/renderergl2/tr_backend.c|  38 -
 code/renderergl2/tr_dsa.c|  46 +--
 code/renderergl2/tr_extensions.c |  99 +++-
 code/renderergl2/tr_fbo.c| 124 ++
 code/renderergl2/tr_glsl.c   |  13 +++-
 code/renderergl2/tr_image.c  |  10 +--
 code/renderergl2/tr_init.c   |  22 --
 code/renderergl2/tr_local.h  |   2 +
 code/renderergl2/tr_shade.c  |  24 ++
 code/renderergl2/tr_shader.c |   4 +-
 code/renderergl2/tr_sky.c|   2 +
 code/renderergl2/tr_surface.c|   2 +
 code/sdl/sdl_glimp.c |  51 ++---
 20 files changed, 313 insertions(+), 349 deletions(-)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 3aaa0e8..80fa0a3 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -381,6 +381,7 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 
 // OpenGL 1.3, was GL_ARB_texture_compression
 #define QGL_1_3_PROCS \
+   GLE(void, ActiveTexture, GLenum texture) \
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) \
 
@@ -478,97 +479,25 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 #define GL_HALF_FLOAT_ARB   0x140B
 #endif
 
-// GL_EXT_framebuffer_object
-#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
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#define GL_RENDERBUFFER_EXT0x8D41
-#define GL_STENCIL_INDEX1_EXT  0x8D46
-#define GL_STENCIL_INDEX4_EXT  0x8D47
-#define GL_STENCIL_INDEX8_EXT  0x8D48
-#define GL_STENCIL_INDEX16_EXT 0x8D49
-#define GL_RENDERBUFFER_WIDTH_EXT  0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT0x8D44
-#define GL_RENDERBUFFER_RED_SIZE_EXT   0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT  0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT   0x8D55
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT  0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT  0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_COLOR_ATTACHMENT0_EXT0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT   

[ioquake3] 30/50: Allow more than 32 surfaces in skin files

[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 904bbc1a8fd83d6798c35975726440e4b8221d31
Author: Zack Middleton 
Date:   Tue Jul 4 13:48:52 2017 -0500

Allow more than 32 surfaces in skin files

Models don't have a surface limit; skins shouldn't either. Some player
models require more than 32 surfaces since vanilla Quake 3 did not
enforce the limit.

Skins are now limited to 256 surfaces because having no limit would
require parsing the skin file twice. The skin surfaces are dynamically
allocated so it doesn't increase memory usage when less surfaces
are used.
---
 code/renderergl1/tr_animation.c |  4 ++--
 code/renderergl1/tr_image.c | 23 ++-
 code/renderergl1/tr_local.h |  8 +++-
 code/renderergl1/tr_mesh.c  |  4 ++--
 code/renderergl1/tr_model_iqm.c |  4 ++--
 code/renderergl2/tr_animation.c |  4 ++--
 code/renderergl2/tr_image.c | 23 ++-
 code/renderergl2/tr_local.h |  8 +++-
 code/renderergl2/tr_mesh.c  |  4 ++--
 code/renderergl2/tr_model_iqm.c |  4 ++--
 10 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/code/renderergl1/tr_animation.c b/code/renderergl1/tr_animation.c
index b01cf81..2979ab9 100644
--- a/code/renderergl1/tr_animation.c
+++ b/code/renderergl1/tr_animation.c
@@ -263,9 +263,9 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {

for(j = 0; j < skin->numSurfaces; j++)
{
-   if (!strcmp(skin->surfaces[j]->name, 
surface->name))
+   if (!strcmp(skin->surfaces[j].name, 
surface->name))
{
-   shader = skin->surfaces[j]->shader;
+   shader = skin->surfaces[j].shader;
break;
}
}
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index b131f36..a926dd8 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -1508,6 +1508,7 @@ RE_RegisterSkin
 ===
 */
 qhandle_t RE_RegisterSkin( const char *name ) {
+   skinSurface_t parseSurfaces[MAX_SKIN_SURFACES];
qhandle_t   hSkin;
skin_t  *skin;
skinSurface_t   *surf;
@@ -1557,8 +1558,8 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// If not a .skin file, load as a single shader
if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
skin->numSurfaces = 1;
-   skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] 
), h_low );
-   skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, 
qtrue );
+   skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low 
);
+   skin->surfaces[0].shader = R_FindShader( name, LIGHTMAP_NONE, 
qtrue );
return hSkin;
}
 
@@ -1591,12 +1592,12 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name
token = CommaParse( _p );
 
-   if ( skin->numSurfaces >= MD3_MAX_SURFACES ) {
-   ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces 
in '%s', the max is %d surfaces!\n", name, MD3_MAX_SURFACES );
+   if ( skin->numSurfaces >= MAX_SKIN_SURFACES ) {
+   ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces 
in '%s', the max is %d surfaces!\n", name, MAX_SKIN_SURFACES );
break;
}
 
-   surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( 
sizeof( *skin->surfaces[0] ), h_low );
+   surf = [skin->numSurfaces];
Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
skin->numSurfaces++;
@@ -1610,6 +1611,10 @@ qhandle_t RE_RegisterSkin( const char *name ) {
return 0;   // use default skin
}
 
+   // copy surfaces to skin
+   skin->surfaces = ri.Hunk_Alloc( skin->numSurfaces * sizeof( 
skinSurface_t ), h_low );
+   memcpy( skin->surfaces, parseSurfaces, skin->numSurfaces * sizeof( 
skinSurface_t ) );
+
return hSkin;
 }
 
@@ -1628,8 +1633,8 @@ void  R_InitSkins( void ) {
skin = tr.skins[0] = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
Q_strncpyz( skin->name, "", sizeof( skin->name )  );
skin->numSurfaces = 1;
-   skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low 
);
-   skin->surfaces[0]->shader = tr.defaultShader;
+   skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
+   skin->surfaces[0].shader = tr.defaultShader;
 }
 
 /*
@@ -1658,10 

[ioquake3] 27/50: Fix nonresponsive favorites in q3_ui having no hostname

[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 cbd9e432b58477d45bbce3d027ad2c8c05e492e3
Author: Zack Middleton 
Date:   Sat Jul 1 14:10:46 2017 -0500

Fix nonresponsive favorites in q3_ui having no hostname

ArenaServers_InsertFavorites() fails to do anything because favorites
are added to the server list even if nonresponsive.

Set nonresponsive favorite server hostname to address.
---
 code/q3_ui/ui_servers2.c | 44 ++--
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 73e41b6..4830805 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -719,38 +719,6 @@ static void ArenaServers_Insert( char* adrstr, char* info, 
int pingtime )
 
 /*
 =
-ArenaServers_InsertFavorites
-
-Insert nonresponsive address book entries into display lists.
-=
-*/
-void ArenaServers_InsertFavorites( void )
-{
-   int i;
-   int j;
-   charinfo[MAX_INFO_STRING];
-
-   // resync existing results with new or deleted cvars
-   info[0] = '\0';
-   Info_SetValueForKey( info, "hostname", "No Response" );
-   for (i=0; i= g_numfavoriteservers)
-   {
-   // not in list, add it
-   ArenaServers_Insert( 
g_arenaservers.favoriteaddresses[i], info, ArenaServers_MaxPing() );
-   }
-   }
-}
-
-
-/*
-=
 ArenaServers_LoadFavorites
 
 Load cvar address book entries into local lists.
@@ -832,12 +800,6 @@ static void ArenaServers_StopRefresh( void )
 
g_arenaservers.refreshservers = qfalse;
 
-   if (g_servertype == UIAS_FAVORITES)
-   {
-   // nonresponsive favorites must be shown
-   ArenaServers_InsertFavorites();
-   }
-
// final tally
if (g_arenaservers.numqueriedservers >= 0)
{
@@ -931,6 +893,12 @@ static void ArenaServers_DoRefresh( void )
// stale it out
info[0] = '\0';
time= maxPing;
+
+   // set hostname for nonresponsive favorite 
server
+   if (g_servertype == UIAS_FAVORITES) {
+   Info_SetValueForKey( info, "hostname", 
adrstr );
+   Info_SetValueForKey( info, "game", 
"???" );
+   }
}
else
{

-- 
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/50: Improve warning for too many skin 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 dd73e1954653b73e05668732843b7e9b97a4ee4e
Author: Zack Middleton 
Date:   Tue Jul 4 15:20:45 2017 -0500

Improve warning for too many skin surfaces
---
 code/renderergl1/tr_image.c | 19 ---
 code/renderergl2/tr_image.c | 19 ---
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index a926dd8..7a4b1ba 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -1519,6 +1519,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
char*text_p;
char*token;
charsurfName[MAX_QPATH];
+   int totalSurfaces;
 
if ( !name || !name[0] ) {
ri.Printf( PRINT_DEVELOPER, "Empty name passed to 
RE_RegisterSkin\n" );
@@ -1569,6 +1570,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
return 0;
}
 
+   totalSurfaces = 0;
text_p = text.c;
while ( text_p && *text_p ) {
// get surface name
@@ -1592,19 +1594,22 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name
token = CommaParse( _p );
 
-   if ( skin->numSurfaces >= MAX_SKIN_SURFACES ) {
-   ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces 
in '%s', the max is %d surfaces!\n", name, MAX_SKIN_SURFACES );
-   break;
+   if ( skin->numSurfaces < MAX_SKIN_SURFACES ) {
+   surf = [skin->numSurfaces];
+   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) 
);
+   surf->shader = R_FindShader( token, LIGHTMAP_NONE, 
qtrue );
+   skin->numSurfaces++;
}
 
-   surf = [skin->numSurfaces];
-   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-   surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
-   skin->numSurfaces++;
+   totalSurfaces++;
}
 
ri.FS_FreeFile( text.v );
 
+   if ( totalSurfaces > MAX_SKIN_SURFACES ) {
+   ri.Printf( PRINT_WARNING, "WARNING: Ignoring excess surfaces 
(found %d, max is %d) in skin '%s'!\n",
+   totalSurfaces, MAX_SKIN_SURFACES, name 
);
+   }
 
// never let a skin have 0 shaders
if ( skin->numSurfaces == 0 ) {
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 7340377..3672910 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -3071,6 +3071,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
char*text_p;
char*token;
charsurfName[MAX_QPATH];
+   int totalSurfaces;
 
if ( !name || !name[0] ) {
ri.Printf( PRINT_DEVELOPER, "Empty name passed to 
RE_RegisterSkin\n" );
@@ -3121,6 +3122,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
return 0;
}
 
+   totalSurfaces = 0;
text_p = text.c;
while ( text_p && *text_p ) {
// get surface name
@@ -3144,19 +3146,22 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name
token = CommaParse( _p );
 
-   if ( skin->numSurfaces >= MAX_SKIN_SURFACES ) {
-   ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces 
in '%s', the max is %d surfaces!\n", name, MAX_SKIN_SURFACES );
-   break;
+   if ( skin->numSurfaces < MAX_SKIN_SURFACES ) {
+   surf = [skin->numSurfaces];
+   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) 
);
+   surf->shader = R_FindShader( token, LIGHTMAP_NONE, 
qtrue );
+   skin->numSurfaces++;
}
 
-   surf = [skin->numSurfaces];
-   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-   surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
-   skin->numSurfaces++;
+   totalSurfaces++;
}
 
ri.FS_FreeFile( text.v );
 
+   if ( totalSurfaces > MAX_SKIN_SURFACES ) {
+   ri.Printf( PRINT_WARNING, "WARNING: Ignoring excess surfaces 
(found %d, max is %d) in skin '%s'!\n",
+   totalSurfaces, MAX_SKIN_SURFACES, name 
);
+   }
 
// never let a skin have 0 shaders
if ( skin->numSurfaces == 0 ) {

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

___
Pkg-games-commits mailing list

[ioquake3] 33/50: Fix warning about using abs() with floats (#222)

[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 a33a904225e92ccacbcd7094732624e3d6a2a96b
Author: Brenton Bostick 
Date:   Sun Jul 9 15:00:56 2017 -0400

Fix warning about using abs() with floats (#222)
---
 code/ui/ui_shared.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index b1718e7..f26d11b 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -1121,10 +1121,10 @@ void Menu_TransitionItemByName(menuDef_t *menu, const 
char *p, rectDef_t rectFro
   item->window.offsetTime = time;
memcpy(>window.rectClient, , 
sizeof(rectDef_t));
memcpy(>window.rectEffects, , 
sizeof(rectDef_t));
-   item->window.rectEffects2.x = abs(rectTo.x - 
rectFrom.x) / amt;
-   item->window.rectEffects2.y = abs(rectTo.y - 
rectFrom.y) / amt;
-   item->window.rectEffects2.w = abs(rectTo.w - 
rectFrom.w) / amt;
-   item->window.rectEffects2.h = abs(rectTo.h - 
rectFrom.h) / amt;
+   item->window.rectEffects2.x = fabs(rectTo.x - 
rectFrom.x) / amt;
+   item->window.rectEffects2.y = fabs(rectTo.y - 
rectFrom.y) / amt;
+   item->window.rectEffects2.w = fabs(rectTo.w - 
rectFrom.w) / amt;
+   item->window.rectEffects2.h = fabs(rectTo.h - 
rectFrom.h) / amt;
   Item_UpdatePosition(item);
 }
   }

-- 
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/50: Allow changing q3_ui server source during refresh

[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 8c3d1fcf59da56620282dd50e40c42b4830a8e0e
Author: Zack Middleton 
Date:   Sat Jul 1 13:30:16 2017 -0500

Allow changing q3_ui server source during refresh

This makes it easier to scroll through the list, especially since
"Local" source now refreshes until a local server is found.
---
 code/q3_ui/ui_servers2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index b6c4ea5..73e41b6 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -421,7 +421,6 @@ static void ArenaServers_UpdateMenu( void ) {
}
else {
// all servers pinged - enable controls
-   g_arenaservers.master.generic.flags &= 
~QMF_GRAYED;
g_arenaservers.gametype.generic.flags   &= ~QMF_GRAYED;
g_arenaservers.sortkey.generic.flags&= ~QMF_GRAYED;
g_arenaservers.showempty.generic.flags  &= ~QMF_GRAYED;
@@ -448,7 +447,6 @@ static void ArenaServers_UpdateMenu( void ) {
g_arenaservers.statusbar.string = "Press SPACE to stop";
 
// disable controls during refresh
-   g_arenaservers.master.generic.flags |= 
QMF_GRAYED;
g_arenaservers.gametype.generic.flags   |= QMF_GRAYED;
g_arenaservers.sortkey.generic.flags|= QMF_GRAYED;
g_arenaservers.showempty.generic.flags  |= QMF_GRAYED;
@@ -1128,6 +1126,8 @@ ArenaServers_SetType
 */
 int ArenaServers_SetType( int type )
 {
+   ArenaServers_StopRefresh();
+
if(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5)
{
char masterstr[2], cvarname[sizeof("sv_master1")];

-- 
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/50: Fix q3_ui cursor going off screen in widescreen

[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 d9c2e9191937e96ea0d40e4e5ac2e7253da978b9
Author: Zack Middleton 
Date:   Sat Jul 1 11:26:17 2017 -0500

Fix q3_ui cursor going off screen in widescreen
---
 code/q3_ui/ui_atoms.c | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c
index 020a33e..f369d35 100644
--- a/code/q3_ui/ui_atoms.c
+++ b/code/q3_ui/ui_atoms.c
@@ -872,17 +872,21 @@ UI_MouseEvent
 void UI_MouseEvent( int dx, int dy )
 {
int i;
+   int bias;
menucommon_s*   m;
 
if (!uis.activemenu)
return;
 
+   // convert X bias to 640 coords
+   bias = uis.bias / uis.xscale;
+
// update mouse screen position
uis.cursorx += dx;
-   if (uis.cursorx < -uis.bias)
-   uis.cursorx = -uis.bias;
-   else if (uis.cursorx > SCREEN_WIDTH+uis.bias)
-   uis.cursorx = SCREEN_WIDTH+uis.bias;
+   if (uis.cursorx < -bias)
+   uis.cursorx = -bias;
+   else if (uis.cursorx > SCREEN_WIDTH+bias)
+   uis.cursorx = SCREEN_WIDTH+bias;
 
uis.cursory += dy;
if (uis.cursory < 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] 18/50: Add range check for bot skill in addbot command

[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 b984dd4a234da326ff50fdaa3f8d38516f4fd98b
Author: Zack Middleton 
Date:   Thu Jun 29 19:22:25 2017 -0500

Add range check for bot skill in addbot command

Adding a bot with skill of 0 doesn't show icon on hud.
---
 code/game/g_bot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 66c9ae3..af4906a 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -772,7 +772,7 @@ void Svcmd_AddBot_f( void ) {
skill = 4;
}
else {
-   skill = atof( string );
+   skill = Com_Clamp( 1, 5, atof( string ) );
}
 
// team

-- 
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/50: OpenGL2: Fix black planar projection shadows (cg_shadows 3)

[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 102c79eb4985464d4e5967cdb760816e120fe089
Author: Zack Middleton 
Date:   Fri Jun 30 13:48:38 2017 -0500

OpenGL2: Fix black planar projection shadows (cg_shadows 3)

Restore MD3 code for cg_shadows 2 and 3 like other model formats.
Fix planar projection shadow deform (cg_shadows 3) to use correct
light direction. I fixed light direction for stencil shadows
(cg_shadows 2) but it's still broken.
---
 code/renderergl2/tr_mesh.c| 26 +-
 code/renderergl2/tr_shadows.c |  4 ++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/code/renderergl2/tr_mesh.c b/code/renderergl2/tr_mesh.c
index 0d6844a..5f7c4ee 100644
--- a/code/renderergl2/tr_mesh.c
+++ b/code/renderergl2/tr_mesh.c
@@ -385,12 +385,28 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
shader = tr.shaders[ surface->shaderIndexes[ 
ent->e.skinNum % surface->numShaderIndexes ] ];
}
 
-   // don't add third_person objects if not viewing through a 
portal
-   if(!personalModel)
-   {
-   srfVaoMdvMesh_t *vaoSurface = >vaoSurfaces[i];
+   // we will add shadows even if the main object isn't visible in 
the view
+
+   // stencil shadows can't do personal models unless I polyhedron 
clip
+   if ( !personalModel
+   && r_shadows->integer == 2 
+   && fogNum == 0
+   && !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
+   && shader->sort == SS_OPAQUE ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.shadowShader, 0, qfalse, qfalse, 0 );
+   }
 
-   R_AddDrawSurf((void *)vaoSurface, shader, fogNum, 
qfalse, qfalse, cubemapIndex );
+   // projection shadows work fine with personal models
+   if ( r_shadows->integer == 3
+   && fogNum == 0
+   && (ent->e.renderfx & RF_SHADOW_PLANE )
+   && shader->sort == SS_OPAQUE ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+   }
+
+   // don't add third_person objects if not viewing through a 
portal
+   if ( !personalModel ) {
+   R_AddDrawSurf((void *)>vaoSurfaces[i], shader, 
fogNum, qfalse, qfalse, cubemapIndex );
}
 
surface++;
diff --git a/code/renderergl2/tr_shadows.c b/code/renderergl2/tr_shadows.c
index 7637175..520bc3f 100644
--- a/code/renderergl2/tr_shadows.c
+++ b/code/renderergl2/tr_shadows.c
@@ -162,7 +162,7 @@ void RB_ShadowTessEnd( void ) {
return;
}
 
-   VectorCopy( backEnd.currentEntity->lightDir, lightDir );
+   VectorCopy( backEnd.currentEntity->modelLightDir, lightDir );
 
// project vertexes away from light direction
for ( i = 0 ; i < tess.numVertexes ; i++ ) {
@@ -302,7 +302,7 @@ void RB_ProjectionShadowDeform( void ) {
 
groundDist = backEnd.or.origin[2] - 
backEnd.currentEntity->e.shadowPlane;
 
-   VectorCopy( backEnd.currentEntity->lightDir, lightDir );
+   VectorCopy( backEnd.currentEntity->modelLightDir, lightDir );
d = DotProduct( lightDir, ground );
// don't let the shadows get too long or go negative
if ( d < 0.5 ) {

-- 
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/50: Add 'addbot random' to README

[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 4b5067cce289b6fd6914e802a9d196a2f2b6178a
Author: Zack Middleton 
Date:   Thu Jun 29 19:57:13 2017 -0500

Add 'addbot random' to README
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 1e5d896..3dd355c 100644
--- a/README.md
+++ b/README.md
@@ -333,6 +333,8 @@ The defaults for these variables differ depending on the 
target platform.
 
   cvar_modified [filter]  - list modified cvars, can filter results (such as 
"r*"
 for renderer cvars) like cvarlist which lists all 
cvars
+
+  addbot random   - the bot name "random" now selects a random bot
 ```
 
 

-- 
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] 25/50: Make UI continue searching for local servers until found

[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 0ba359c29ec543ba4b6bdf62d1daa603208952d7
Author: Zack Middleton 
Date:   Sat Jul 1 12:46:54 2017 -0500

Make UI continue searching for local servers until found

When refreshing local servers, Team Arean UI never changed the status
message when it timed out. This gave a false impression it was still
looking for servers.

Let's continue looking for local servers in q3_ui and Team Arena UI
until one is found.
---
 code/q3_ui/ui_servers2.c | 7 +++
 code/ui/ui_main.c| 6 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index d376d36..b6c4ea5 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -881,6 +881,13 @@ static void ArenaServers_DoRefresh( void )
  return;
}
  }
+   } else if (g_servertype == UIAS_LOCAL) {
+   if (!trap_LAN_GetServerCount(AS_LOCAL)) {
+   // no local servers found, check again
+   trap_Cmd_ExecuteText( EXEC_APPEND, "localservers\n" );
+   g_arenaservers.refreshtime = uis.realtime + 5000;
+   return;
+   }
}
 
if (uis.realtime < g_arenaservers.nextpingtime)
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index c4f3ba5..81b324b 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -5985,6 +5985,10 @@ static void UI_DoServerRefresh( void )
UI_BuildServerDisplayList(2);
// stop the refresh
UI_StopServerRefresh();
+   } else if ( ui_netSource.integer == UIAS_LOCAL ) {
+   // no local servers found, check again
+   trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
}
//
UI_BuildServerDisplayList(qfalse);
@@ -6032,7 +6036,7 @@ static void UI_StartServerRefresh(qboolean full, qboolean 
force)
//
if( ui_netSource.integer == UIAS_LOCAL ) {
trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
-   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 1000;
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
return;
}
 

-- 
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/50: OpenGL2: Remove two unused cvars and update readme

[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 5aa7fb39c266dafc03d52d56aec91b29b1b5640d
Author: Zack Middleton 
Date:   Sun Jul 2 16:47:55 2017 -0500

OpenGL2: Remove two unused cvars and update readme
---
 code/renderergl2/tr_init.c  |  5 -
 code/renderergl2/tr_local.h |  3 ---
 opengl2-readme.md   | 21 ++---
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 3f36496..2e63559 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -105,9 +105,6 @@ cvar_t  *r_arb_seamless_cube_map;
 cvar_t  *r_arb_vertex_array_object;
 cvar_t  *r_ext_direct_state_access;
 
-cvar_t  *r_mergeMultidraws;
-cvar_t  *r_mergeLeafSurfaces;
-
 cvar_t  *r_cameraExposure;
 
 cvar_t  *r_externalGLSL;
@@ -1293,8 +1290,6 @@ void R_Register( void )
r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
 
r_anaglyphMode = ri.Cvar_Get("r_anaglyphMode", "0", CVAR_ARCHIVE);
-   r_mergeMultidraws = ri.Cvar_Get("r_mergeMultidraws", "1", CVAR_ARCHIVE);
-   r_mergeLeafSurfaces = ri.Cvar_Get("r_mergeLeafSurfaces", "1", 
CVAR_ARCHIVE);
 
//
// temporary variables that can change at any time
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 7e8e4b7..1fc91f7 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -1708,9 +1708,6 @@ externcvar_t  *r_skipBackEnd;
 
 extern cvar_t  *r_anaglyphMode;
 
-extern  cvar_t  *r_mergeMultidraws;
-extern  cvar_t  *r_mergeLeafSurfaces;
-
 extern  cvar_t  *r_externalGLSL;
 
 extern  cvar_t  *r_hdr;
diff --git a/opengl2-readme.md b/opengl2-readme.md
index 857a460..1b1db20 100644
--- a/opengl2-readme.md
+++ b/opengl2-readme.md
@@ -136,7 +136,7 @@ Cvars for HDR and tonemapping:
r_hdr, r_postprocess, and r_toneMap.
  0 - No.
  1 - Yes. (default)
- 
+
 *  `r_forceAutoExposure`- Cheat.  Override built-in and map auto
exposure settings and use cvars
r_forceAutoExposureMin and 
@@ -252,7 +252,7 @@ Cvars for image interpolation and generation:
  FCBI without second derivatives)
  2 - Okay but slow (normal FCBI)
 
-*  `r_genNormalMaps*- Naively generate normal maps for all
+*  `r_genNormalMaps`- Naively generate normal maps for all
textures.
  0 - Don't. (default)
  1 - Do.
@@ -302,23 +302,6 @@ Cvars for the sunlight and cascaded shadow maps:
 
 Cvars that you probably don't care about or shouldn't mess with:
 
-*  `r_mergeMultidraws`  - Optimize number of calls to 
-   glMultiDrawElements().
- 0 - Don't.
- 1 - Do some. (default)
- 2 - Do more than necessary (eats CPU).
-
-*  `r_mergeLeafSurfaces`- Merge surfaces that share common 
materials
-   and a common leaf.  Speeds up rendering.
- 0 - Don't.
- 1 - Do. (default)
-
-*  `r_recalcMD3Normals` - Recalculate the normals when loading an 
MD3.
-   Fixes normal maps in some cases but looks
-   ugly in others.
- 0 - Don't. (default)
- 1 - Do.
-
 *  `r_depthPrepass` - Do a depth-only pass before rendering.
Speeds up rendering in cases where advanced
features are used.  Required for

-- 
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] 24/50: Make Team Arena UI aspect correct in widescreen

[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 21eeaee9c840ac781996c06e97071dda6a2dc600
Author: Zack Middleton 
Date:   Sat Jul 1 11:27:31 2017 -0500

Make Team Arena UI aspect correct in widescreen
---
 code/ui/ui_atoms.c | 10 +-
 code/ui/ui_main.c  | 36 
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/code/ui/ui_atoms.c b/code/ui/ui_atoms.c
index cdc4aeb..44ff3b0 100644
--- a/code/ui/ui_atoms.c
+++ b/code/ui/ui_atoms.c
@@ -420,18 +420,10 @@ Adjusted for resolution and screen aspect ratio
 */
 void UI_AdjustFrom640( float *x, float *y, float *w, float *h ) {
// expect valid pointers
-#if 0
-   *x = *x * uiInfo.uiDC.scale + uiInfo.uiDC.bias;
-   *y *= uiInfo.uiDC.scale;
-   *w *= uiInfo.uiDC.scale;
-   *h *= uiInfo.uiDC.scale;
-#endif
-
-   *x *= uiInfo.uiDC.xscale;
+   *x = *x * uiInfo.uiDC.xscale + uiInfo.uiDC.bias;
*y *= uiInfo.uiDC.yscale;
*w *= uiInfo.uiDC.xscale;
*h *= uiInfo.uiDC.yscale;
-
 }
 
 void UI_DrawNamedPic( float x, float y, float width, float height, const char 
*picname ) {
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index 3660470..c4f3ba5 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -129,6 +129,7 @@ static void UI_ParseTeamInfo(const char *teamFile);
 static const char *UI_SelectedMap(int index, int *actual);
 static const char *UI_SelectedHead(int index, int *actual);
 static int UI_GetIndexFromSelection(int actual);
+static void UI_DrawCinematic(int handle, float x, float y, float w, float h);
 
 int ProcessNewUI( int command, int arg0, int arg1, int arg2, int arg3, int 
arg4, int arg5, int arg6 );
 
@@ -1110,8 +,7 @@ 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);
-   
trap_CIN_SetExtents(uiInfo.teamList[i].cinematic, rect->x, rect->y, rect->w, 
rect->h);
-   
trap_CIN_DrawCinematic(uiInfo.teamList[i].cinematic);
+   UI_DrawCinematic(uiInfo.teamList[i].cinematic, 
rect->x, rect->y, rect->w, rect->h);
} else {
trap_R_SetColor( color );
UI_DrawHandlePic( rect->x, rect->y, rect->w, 
rect->h, uiInfo.teamList[i].teamIcon_Metal);
@@ -1132,8 +1132,7 @@ 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);
-   trap_CIN_SetExtents(uiInfo.previewMovie, rect->x, 
rect->y, rect->w, rect->h);
-   trap_CIN_DrawCinematic(uiInfo.previewMovie);
+   UI_DrawCinematic(uiInfo.previewMovie, rect->x, rect->y, 
rect->w, rect->h);
} else {
uiInfo.previewMovie = -2;
}
@@ -1256,8 +1255,7 @@ static void UI_DrawMapCinematic(rectDef_t *rect, float 
scale, vec4_t color, qboo
}
if (uiInfo.mapList[map].cinematic >= 0) {
  trap_CIN_RunCinematic(uiInfo.mapList[map].cinematic);
- trap_CIN_SetExtents(uiInfo.mapList[map].cinematic, rect->x, 
rect->y, rect->w, rect->h);
-   trap_CIN_DrawCinematic(uiInfo.mapList[map].cinematic);
+ UI_DrawCinematic(uiInfo.mapList[map].cinematic, rect->x, 
rect->y, rect->w, rect->h);
} else {
uiInfo.mapList[map].cinematic = -2;
}
@@ -1337,8 +1335,7 @@ static void UI_DrawNetMapCinematic(rectDef_t *rect, float 
scale, vec4_t color) {
 
if (uiInfo.serverStatus.currentServerCinematic >= 0) {
  trap_CIN_RunCinematic(uiInfo.serverStatus.currentServerCinematic);
- trap_CIN_SetExtents(uiInfo.serverStatus.currentServerCinematic, 
rect->x, rect->y, rect->w, rect->h);
- trap_CIN_DrawCinematic(uiInfo.serverStatus.currentServerCinematic);
+ UI_DrawCinematic(uiInfo.serverStatus.currentServerCinematic, rect->x, 
rect->y, rect->w, rect->h);
} else {
UI_DrawNetMapPreview(rect, scale, color);
}
@@ -4974,6 +4971,15 @@ static void UI_StopCinematic(int handle) {
 }
 
 static void UI_DrawCinematic(int handle, float x, float y, float w, float h) {
+   // adjust coords to get correct placement in wide screen
+   UI_AdjustFrom640( , , ,  );
+
+   // CIN_SetExtents takes stretched 640x480 virtualized coords
+   x *= SCREEN_WIDTH / 

[ioquake3] 20/50: OpenGL2: Fix checking r_shadowCascadeZFar pointer instead of value

[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 09a23e04177202d197348104e1991f0bd622045a
Author: Zack Middleton 
Date:   Thu Jun 29 21:34:39 2017 -0500

OpenGL2: Fix checking r_shadowCascadeZFar pointer instead of value
---
 code/renderergl2/tr_scene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index 2d039e7..e336978 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -491,7 +491,7 @@ void RE_RenderScene( const refdef_t *fd ) {
// playing with even more shadows
if(glRefConfig.framebufferObject && r_sunlightMode->integer && !( 
fd->rdflags & RDF_NOWORLDMODEL ) && (r_forceSun->integer || tr.sunShadows))
{
-   if (r_shadowCascadeZFar != 0)
+   if (r_shadowCascadeZFar->integer != 0)
{
R_RenderSunShadowMaps(fd, 0);
R_RenderSunShadowMaps(fd, 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] 13/50: Fix bot_minplayers passing delay as team to addbot in non-team gametypes

[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 d0d1fe1b7c7e0321b06e170b6552fd1bd2194820
Author: Zack Middleton 
Date:   Thu Jun 29 15:52:20 2017 -0500

Fix bot_minplayers passing delay as team to addbot in non-team gametypes
---
 code/game/g_bot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 4d3eb61..2c363eb 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -317,7 +317,7 @@ void G_AddRandomBot( int team ) {
skill = trap_Cvar_VariableValue( "g_spSkill" );
if (team == TEAM_RED) teamstr = "red";
else if (team == TEAM_BLUE) teamstr = "blue";
-   else teamstr = "";
+   else teamstr = "free";
Q_strncpyz(netname, value, sizeof(netname));
Q_CleanStr(netname);
trap_SendConsoleCommand( EXEC_INSERT, va("addbot %s %f %s %i\n", 
netname, skill, teamstr, 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] 22/50: OpenGL2: Draw sun shadows for first person IQM player models

[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 e77153766a2beff3b4fd4b115e52e0a617abb9c0
Author: Zack Middleton 
Date:   Fri Jun 30 13:59:07 2017 -0500

OpenGL2: Draw sun shadows for first person IQM player models

This makes IQM have the same behavior as MD3 and MDR.
---
 code/renderergl2/tr_model_iqm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_model_iqm.c b/code/renderergl2/tr_model_iqm.c
index ce6d361..67d3491 100644
--- a/code/renderergl2/tr_model_iqm.c
+++ b/code/renderergl2/tr_model_iqm.c
@@ -849,7 +849,8 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
surface = data->surfaces;
 
// don't add third_person objects if not in a portal
-   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!tr.viewParms.isPortal;
+   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!(tr.viewParms.isPortal
+|| (tr.viewParms.flags & (VPF_SHADOWMAP | 
VPF_DEPTHSHADOW)));
 
if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
ent->e.frame %= data->num_frames;

-- 
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] 16/50: Fix duplicate (delayed) random bots being choosen

[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 0999aff28dbc198b19e38399cc50c468bbbdb0b3
Author: Zack Middleton 
Date:   Thu Jun 29 17:07:32 2017 -0500

Fix duplicate (delayed) random bots being choosen

Count delayed bots when looking for least used bot infos for deciding
which bot to add.
---
 code/game/g_bot.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 1ec4f68..bda1f7d 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -232,6 +232,8 @@ static void PlayerIntroSound( const char *modelAndSkin ) {
 ===
 G_CountBotPlayersByName
 
+Check connected and connecting (delay join) bots.
+
 Returns number of bots with name on specified team or whole server if team is 
-1.
 ===
 */
@@ -242,7 +244,7 @@ int G_CountBotPlayersByName( const char *name, int team ) {
num = 0;
for ( i=0 ; i< g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {

-- 
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] 17/50: Don't pick duplicate random bots until all bot types are added

[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 cabc32362c1093320ce4b03d939df2deabba020a
Author: Zack Middleton 
Date:   Thu Jun 29 17:51:30 2017 -0500

Don't pick duplicate random bots until all bot types are added

Don't add the same bot to multiple teams until there are as many
bots on the server as there are bot types.

Previously each team would have unique bots until all bot types
were added to the team but other teams may have the same bot. Now
there will not be any duplicate bots until there are more bots than
bot types.

Now Quake 3 (32 bot types) in 16 vs 16 bot CTF will not contain
duplicate bot types. (You have to increase memory in code/game/
g_mem.c in order to add 32 bots though.)

I had to change G_AddRandomBot() to use 'addbot random' or else the
same bot could be added to red and blue teams. The bot was selected
and stored in console command buffer so game doesn't know not to
select the bot again.
---
 code/game/g_bot.c | 21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index bda1f7d..66c9ae3 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -274,6 +274,11 @@ int G_SelectRandomBotInfo( int team ) {
int count, bestCount;
char*value;
 
+   // don't add duplicate bots to the server if there are less bots than 
bot types
+   if ( team != -1 && G_CountBotPlayersByName( NULL, -1 ) < g_numBots ) {
+   team = -1;
+   }
+
num = 0;
bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
@@ -312,26 +317,14 @@ G_AddRandomBot
 ===
 */
 void G_AddRandomBot( int team ) {
-   int n;
-   char*value, netname[36], *teamstr;
+   char*teamstr;
float   skill;
 
-   n = G_SelectRandomBotInfo( team );
-
-   if ( n < 0 ) {
-   // no bot info available
-   return;
-   }
-
-   value = Info_ValueForKey( g_botInfos[n], "name" );
-
skill = trap_Cvar_VariableValue( "g_spSkill" );
if (team == TEAM_RED) teamstr = "red";
else if (team == TEAM_BLUE) teamstr = "blue";
else teamstr = "free";
-   Q_strncpyz(netname, value, sizeof(netname));
-   Q_CleanStr(netname);
-   trap_SendConsoleCommand( EXEC_INSERT, va("addbot %s %f %s %i\n", 
netname, skill, teamstr, 0) );
+   trap_SendConsoleCommand( EXEC_INSERT, va("addbot random %f %s %i\n", 
skill, teamstr, 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] 14/50: Fix not adding random bot when all bot info are in use on team

[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 7c601da6510252b17fdb1909f15d94f6a912142d
Author: Zack Middleton 
Date:   Thu Jun 29 15:59:09 2017 -0500

Fix not adding random bot when all bot info are in use on team

If there are two bot infos in scripts/bots.txt then each team can
only add two random bots via bot_minplayers or addbot random.

Pick random bot info from least used bot infos instead of only ones
that are used by zero players. That way a random bot can always be
added to the game.

This rarely affected Quake 3 since there is 32 bot infos. It could
easily affect new games though.
---
 code/game/g_bot.c | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 2c363eb..fc6a321 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -263,22 +263,31 @@ int G_CountBotPlayersByName( const char *name, int team ) 
{
 ===
 G_SelectRandomBotInfo
 
-Get random unused bot info on team or whole server if team is -1.
+Get random least used bot info on team or whole server if team is -1.
 ===
 */
 int G_SelectRandomBotInfo( int team ) {
int selection[MAX_BOTS];
int n, num;
+   int count, bestCount;
char*value;
 
num = 0;
+   bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
value = Info_ValueForKey( g_botInfos[n], "funname" );
if ( !value[0] ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
}
//
-   if ( G_CountBotPlayersByName( value, team ) == 0 ) {
+   count = G_CountBotPlayersByName( value, team );
+
+   if ( count < bestCount ) {
+   bestCount = count;
+   num = 0;
+   }
+
+   if ( count == bestCount ) {
selection[num++] = n;
 
if ( num == MAX_BOTS ) {
@@ -308,7 +317,7 @@ void G_AddRandomBot( int team ) {
n = G_SelectRandomBotInfo( team );
 
if ( n < 0 ) {
-   // all bot types are in use on team
+   // no bot info available
return;
}
 
@@ -636,7 +645,7 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
botinfoNum = G_SelectRandomBotInfo( teamNum );
 
if ( botinfoNum < 0 ) {
-   G_Printf( S_COLOR_YELLOW "WARNING: Cannot add random 
bot: all bot types in use on team '%s'.\n", team );
+   G_Printf( S_COLOR_RED "Error: Cannot add random bot, no 
bot info available.\n" );
trap_BotFreeClient( clientNum );
return;
}

-- 
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] 12/50: Fix random bot not looking for bots by funname

[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 51649695a56c86333113991458318d450935ec2b
Author: Zack Middleton 
Date:   Thu Jun 29 15:37:02 2017 -0500

Fix random bot not looking for bots by funname

Quake 3's Anarki bot has a 'funname' with colors in it.
This commit fixes Anarki not being detected as in use.
---
 code/game/g_bot.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 3b1e011..4d3eb61 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -273,7 +273,10 @@ int G_SelectRandomBotInfo( int team ) {
 
num = 0;
for ( n = 0; n < g_numBots ; n++ ) {
-   value = Info_ValueForKey( g_botInfos[n], "name" );
+   value = Info_ValueForKey( g_botInfos[n], "funname" );
+   if ( !value[0] ) {
+   value = Info_ValueForKey( g_botInfos[n], "name" );
+   }
//
if ( G_CountBotPlayersByName( value, team ) == 0 ) {
selection[num++] = n;

-- 
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/50: Check delayed bot's team when counting bots for bot_minplayers

[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 d8f2ff7a4b452ebe30bf5628cb3710284066359b
Author: Zack Middleton 
Date:   Thu Jun 29 16:40:22 2017 -0500

Check delayed bot's team when counting bots for bot_minplayers

note: This requires my previous commit that added teampref userinfo
so that bots choose correct team in ClientConnect.
---
 code/game/g_bot.c | 15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index fc6a321..1ec4f68 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -387,16 +387,18 @@ int G_CountHumanPlayers( int team ) {
 /*
 ===
 G_CountBotPlayers
+
+Check connected and connecting (delay join) bots.
 ===
 */
 int G_CountBotPlayers( int team ) {
-   int i, n, num;
+   int i, num;
gclient_t   *cl;
 
num = 0;
for ( i=0 ; i< g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
@@ -407,15 +409,6 @@ int G_CountBotPlayers( int team ) {
}
num++;
}
-   for( n = 0; n < BOT_SPAWN_QUEUE_DEPTH; n++ ) {
-   if( !botSpawnQueue[n].spawnTime ) {
-   continue;
-   }
-   if ( botSpawnQueue[n].spawnTime > level.time ) {
-   continue;
-   }
-   num++;
-   }
return num;
 }
 

-- 
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/50: travis-ci: Upgrade to docker build system

[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 ccfc9011e24d952beb61a5051c90581cc7106e36
Author: Zack Middleton 
Date:   Sat Jun 24 20:51:07 2017 -0500

travis-ci: Upgrade to docker build system
---
 .travis.yml | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fd2926..09eb769 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,8 @@
+# sudo is required for travis-ci to use ubuntu trusty
+# ubuntu trusty is required for libsdl2-dev
+sudo: required
+dist: trusty
+
 language: c
 
 env:
@@ -17,16 +22,21 @@ env:
 
 script: ./travis-ci-build.sh
 
-before_install:
-  - echo "yes" | sudo apt-add-repository ppa:zoogie/sdl2-snapshots
-  - sudo apt-get update -qq
-  - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libfreetype6-dev 
mingw-w64
-
 notifications:
   email: false
 
 addons:
+  apt:
+packages:
+  - binutils-mingw-w64-i686
+  - gcc-mingw-w64-i686
+  - binutils-mingw-w64-x86-64
+  - gcc-mingw-w64-x86-64
+  - gcc-mingw-w64
+  - mingw-w64
+  - libgl1-mesa-dev
+  - libsdl2-dev
+  - libfreetype6-dev
   coverity_scan:
 project:
   name: "ioquake/ioq3"

-- 
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] 10/50: Split G_AddRandomBot into multiple functions

[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 007e250e114d9f74ad3b3e1446082b652b1cff61
Author: Zack Middleton 
Date:   Thu Jun 29 15:30:16 2017 -0500

Split G_AddRandomBot into multiple functions
---
 code/game/g_bot.c | 123 --
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index c509772..52db7cb 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -230,71 +230,94 @@ static void PlayerIntroSound( const char *modelAndSkin ) {
 
 /*
 ===
-G_AddRandomBot
+G_CountBotPlayersByName
+
+Returns number of bots with name on specified team or whole server if team is 
-1.
 ===
 */
-void G_AddRandomBot( int team ) {
-   int i, n, num;
-   float   skill;
-   char*value, netname[36], *teamstr;
+int G_CountBotPlayersByName( const char *name, int team ) {
+   int i, num;
gclient_t   *cl;
 
num = 0;
-   for ( n = 0; n < g_numBots ; n++ ) {
-   value = Info_ValueForKey( g_botInfos[n], "name" );
-   //
-   for ( i=0 ; i< g_maxclients.integer ; i++ ) {
-   cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
-   continue;
-   }
-   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
-   continue;
-   }
-   if ( team >= 0 && cl->sess.sessionTeam != team ) {
-   continue;
-   }
-   if ( !Q_stricmp( value, cl->pers.netname ) ) {
-   break;
-   }
+   for ( i=0 ; i< g_maxclients.integer ; i++ ) {
+   cl = level.clients + i;
+   if ( cl->pers.connected != CON_CONNECTED ) {
+   continue;
+   }
+   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
+   continue;
}
-   if (i >= g_maxclients.integer) {
-   num++;
+   if ( team >= 0 && cl->sess.sessionTeam != team ) {
+   continue;
+   }
+   if ( name && Q_stricmp( name, cl->pers.netname ) ) {
+   continue;
}
+   num++;
}
-   num = random() * num;
+   return num;
+}
+
+/*
+===
+G_SelectRandomBotInfo
+
+Get random unused bot info on team or whole server if team is -1.
+===
+*/
+int G_SelectRandomBotInfo( int team ) {
+   int selection[MAX_BOTS];
+   int n, num;
+   char*value;
+
+   num = 0;
for ( n = 0; n < g_numBots ; n++ ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
//
-   for ( i=0 ; i< g_maxclients.integer ; i++ ) {
-   cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
-   continue;
-   }
-   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
-   continue;
-   }
-   if ( team >= 0 && cl->sess.sessionTeam != team ) {
-   continue;
-   }
-   if ( !Q_stricmp( value, cl->pers.netname ) ) {
+   if ( G_CountBotPlayersByName( value, team ) == 0 ) {
+   selection[num++] = n;
+
+   if ( num == MAX_BOTS ) {
break;
}
}
-   if (i >= g_maxclients.integer) {
-   num--;
-   if (num <= 0) {
-   skill = trap_Cvar_VariableValue( "g_spSkill" );
-   if (team == TEAM_RED) teamstr = "red";
-   else if (team == TEAM_BLUE) teamstr = "blue";
-   else teamstr = "";
-   Q_strncpyz(netname, value, sizeof(netname));
-   Q_CleanStr(netname);
-   trap_SendConsoleCommand( EXEC_INSERT, 
va("addbot %s %f %s %i\n", netname, skill, teamstr, 0) );
-   return;
-   }
-   }
}
+
+   if ( num > 0 ) {
+   num = random() * ( num - 1 );
+   return selection[num];
+   }
+
+   return -1;
+}
+
+/*
+===
+G_AddRandomBot
+===
+*/
+void G_AddRandomBot( int team ) {
+   int n;
+   char*value, netname[36], *teamstr;
+   

[ioquake3] 04/50: Make cg_teamChatsOnly only affect team gametypes

[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 520b10044924b6e687d857827801752a1c5be523
Author: Zack Middleton 
Date:   Sat Jun 24 19:47:35 2017 -0500

Make cg_teamChatsOnly only affect team gametypes

Also made it so that 'tell voice chats' are always allowed for
consistancy with 'tell chat'.

Reported by Tobias Kuehnhammer.
---
 code/cgame/cg_servercmds.c | 45 -
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index d1c8b28..57ca19b 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -899,6 +899,10 @@ void CG_VoiceChatLocal( int mode, qboolean voiceOnly, int 
clientNum, int color,
return;
}
 
+   if ( mode == SAY_ALL && cgs.gametype >= GT_TEAM && 
cg_teamChatsOnly.integer ) {
+   return;
+   }
+
if ( clientNum < 0 || clientNum >= MAX_CLIENTS ) {
clientNum = 0;
}
@@ -909,23 +913,20 @@ void CG_VoiceChatLocal( int mode, qboolean voiceOnly, int 
clientNum, int color,
voiceChatList = CG_VoiceChatListForClient( clientNum );
 
if ( CG_GetVoiceChat( voiceChatList, cmd, ,  ) ) {
-   //
-   if ( mode == SAY_TEAM || !cg_teamChatsOnly.integer ) {
-   vchat.clientNum = clientNum;
-   vchat.snd = snd;
-   vchat.voiceOnly = voiceOnly;
-   Q_strncpyz(vchat.cmd, cmd, sizeof(vchat.cmd));
-   if ( mode == SAY_TELL ) {
-   Com_sprintf(vchat.message, 
sizeof(vchat.message), "[%s]: %c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
-   }
-   else if ( mode == SAY_TEAM ) {
-   Com_sprintf(vchat.message, 
sizeof(vchat.message), "(%s): %c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
-   }
-   else {
-   Com_sprintf(vchat.message, 
sizeof(vchat.message), "%s: %c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
-   }
-   CG_AddBufferedVoiceChat();
+   vchat.clientNum = clientNum;
+   vchat.snd = snd;
+   vchat.voiceOnly = voiceOnly;
+   Q_strncpyz(vchat.cmd, cmd, sizeof(vchat.cmd));
+   if ( mode == SAY_TELL ) {
+   Com_sprintf(vchat.message, sizeof(vchat.message), 
"[%s]: %c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
+   }
+   else if ( mode == SAY_TEAM ) {
+   Com_sprintf(vchat.message, sizeof(vchat.message), 
"(%s): %c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
}
+   else {
+   Com_sprintf(vchat.message, sizeof(vchat.message), "%s: 
%c%c%s", ci->name, Q_COLOR_ESCAPE, color, chat);
+   }
+   CG_AddBufferedVoiceChat();
}
 }
 
@@ -1017,12 +1018,14 @@ static void CG_ServerCommand( void ) {
}
 
if ( !strcmp( cmd, "chat" ) ) {
-   if ( !cg_teamChatsOnly.integer ) {
-   trap_S_StartLocalSound( cgs.media.talkSound, 
CHAN_LOCAL_SOUND );
-   Q_strncpyz( text, CG_Argv(1), MAX_SAY_TEXT );
-   CG_RemoveChatEscapeChar( text );
-   CG_Printf( "%s\n", text );
+   if ( cgs.gametype >= GT_TEAM && cg_teamChatsOnly.integer ) {
+   return;
}
+
+   trap_S_StartLocalSound( cgs.media.talkSound, CHAN_LOCAL_SOUND );
+   Q_strncpyz( text, CG_Argv(1), MAX_SAY_TEXT );
+   CG_RemoveChatEscapeChar( text );
+   CG_Printf( "%s\n", text );
return;
}
 

-- 
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/50: travis-ci: Don't run coverity_scan on master branch

[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 2e5c4bd96a206eabd0801f59c914958d7ef22fc7
Author: Zack Middleton 
Date:   Sat Jun 24 20:48:06 2017 -0500

travis-ci: Don't run coverity_scan on master branch

Once the weekly limit for Coverity scan is reached all builds exit
success without compiling.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0d46590..0fd2926 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,4 +34,4 @@ addons:
 notification_email: quake3-comm...@icculus.org
 build_command_prepend: "make clean"
 build_command: "make release"
-branch_pattern: master
+branch_pattern: coverity_scan

-- 
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/50: Make 'addbot random' command select a random bot info

[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 23a331c9f819a3465b14216096be794f207826e4
Author: Zack Middleton 
Date:   Thu Jun 29 15:33:01 2017 -0500

Make 'addbot random' command select a random bot info

It reuses the random bot selection code for bot_minplayers cvar.
---
 code/game/g_bot.c | 62 +--
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 52db7cb..3b1e011 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -582,6 +582,8 @@ G_AddBot
 */
 static void G_AddBot( const char *name, float skill, const char *team, int 
delay, char *altname) {
int clientNum;
+   int teamNum;
+   int botinfoNum;
char*botinfo;
char*key;
char*s;
@@ -598,8 +600,50 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
return;
}
 
+   // set default team
+   if( !team || !*team ) {
+   if( g_gametype.integer >= GT_TEAM ) {
+   if( PickTeam(clientNum) == TEAM_RED) {
+   team = "red";
+   }
+   else {
+   team = "blue";
+   }
+   }
+   else {
+   team = "free";
+   }
+   }
+
// get the botinfo from bots.txt
-   botinfo = G_GetBotInfoByName( name );
+   if ( Q_stricmp( name, "random" ) == 0 ) {
+   if ( Q_stricmp( team, "red" ) == 0 || Q_stricmp( team, "r" ) == 
0 ) {
+   teamNum = TEAM_RED;
+   }
+   else if ( Q_stricmp( team, "blue" ) == 0 || Q_stricmp( team, 
"b" ) == 0 ) {
+   teamNum = TEAM_BLUE;
+   }
+   else if ( !Q_stricmp( team, "spectator" ) || !Q_stricmp( team, 
"s" ) ) {
+   teamNum = TEAM_SPECTATOR;
+   }
+   else {
+   teamNum = TEAM_FREE;
+   }
+
+   botinfoNum = G_SelectRandomBotInfo( teamNum );
+
+   if ( botinfoNum < 0 ) {
+   G_Printf( S_COLOR_YELLOW "WARNING: Cannot add random 
bot: all bot types in use on team '%s'.\n", team );
+   trap_BotFreeClient( clientNum );
+   return;
+   }
+
+   botinfo = G_GetBotInfoByNumber( botinfoNum );
+   }
+   else {
+   botinfo = G_GetBotInfoByName( name );
+   }
+
if ( !botinfo ) {
G_Printf( S_COLOR_RED "Error: Bot '%s' not defined\n", name );
trap_BotFreeClient( clientNum );
@@ -621,6 +665,7 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
Info_SetValueForKey( userinfo, "rate", "25000" );
Info_SetValueForKey( userinfo, "snaps", "20" );
Info_SetValueForKey( userinfo, "skill", va("%.2f", skill) );
+   Info_SetValueForKey( userinfo, "teampref", team );
 
if ( skill >= 1 && skill < 2 ) {
Info_SetValueForKey( userinfo, "handicap", "50" );
@@ -679,21 +724,6 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
}
Info_SetValueForKey( userinfo, "characterfile", s );
 
-   if( !team || !*team ) {
-   if( g_gametype.integer >= GT_TEAM ) {
-   if( PickTeam(clientNum) == TEAM_RED) {
-   team = "red";
-   }
-   else {
-   team = "blue";
-   }
-   }
-   else {
-   team = "red";
-   }
-   }
-   Info_SetValueForKey( userinfo, "teampref", team );
-
// register the userinfo
trap_SetUserinfo( clientNum, userinfo );
 

-- 
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] 06/50: Have spectator always be in first person

[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 7b9ccd14634df177280484db845ada007ea13be9
Author: Zack Middleton 
Date:   Sat Jun 24 20:02:44 2017 -0500

Have spectator always be in first person

Flying around in third person with no body is weird.
---
 code/cgame/cg_view.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 1131841..74bd248 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -796,7 +796,8 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t 
stereoView, qboolean demo
CG_PredictPlayerState();
 
// decide on third person view
-   cg.renderingThirdPerson = cg_thirdPerson.integer || 
(cg.snap->ps.stats[STAT_HEALTH] <= 0);
+   cg.renderingThirdPerson = cg.snap->ps.persistant[PERS_TEAM] != 
TEAM_SPECTATOR
+   && 
(cg_thirdPerson.integer || (cg.snap->ps.stats[STAT_HEALTH] <= 0));
 
// build cg.refdef
inwater = CG_CalcViewValues();

-- 
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] 05/50: Check for unlimited time power up using INT_MAX

[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 c2ca5e7856bb66715fbacdebf9d70c01fcc9ef11
Author: Zack Middleton 
Date:   Sat Jun 24 19:53:37 2017 -0500

Check for unlimited time power up using INT_MAX

It is possible for a power up to exceed 999 seconds without it being
unlimited time.
---
 code/cgame/cg_draw.c| 11 ---
 code/cgame/cg_newdraw.c | 11 ---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
index 4b6df01..9566682 100644
--- a/code/cgame/cg_draw.c
+++ b/code/cgame/cg_draw.c
@@ -1197,10 +1197,15 @@ static float CG_DrawPowerups( float y ) {
if ( !ps->powerups[ i ] ) {
continue;
}
-   t = ps->powerups[ i ] - cg.time;
-   // ZOID--don't draw if the power up has unlimited time (999 
seconds)
+
+   // ZOID--don't draw if the power up has unlimited time
// This is true of the CTF flags
-   if ( t < 0 || t > 999000) {
+   if ( ps->powerups[ i ] == INT_MAX ) {
+   continue;
+   }
+
+   t = ps->powerups[ i ] - cg.time;
+   if ( t <= 0 ) {
continue;
}
 
diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c
index a2749b2..680bd6c 100644
--- a/code/cgame/cg_newdraw.c
+++ b/code/cgame/cg_newdraw.c
@@ -832,10 +832,15 @@ static void CG_DrawAreaPowerUp(rectDef_t *rect, int 
align, float special, float
if ( !ps->powerups[ i ] ) {
continue;
}
-   t = ps->powerups[ i ] - cg.time;
-   // ZOID--don't draw if the power up has unlimited time (999 
seconds)
+
+   // ZOID--don't draw if the power up has unlimited time
// This is true of the CTF flags
-   if ( t <= 0 || t >= 999000) {
+   if ( ps->powerups[ i ] == INT_MAX ) {
+   continue;
+   }
+
+   t = ps->powerups[ i ] - cg.time;
+   if ( t <= 0 ) {
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] 07/50: Allow spectators to use noclip cheat

[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 03336dd0bf823b8f3743b5329613d2e00f7a94e1
Author: Zack Middleton 
Date:   Sat Jun 24 20:04:27 2017 -0500

Allow spectators to use noclip cheat
---
 code/game/g_active.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/game/g_active.c b/code/game/g_active.c
index 93ff714..775604a 100644
--- a/code/game/g_active.c
+++ b/code/game/g_active.c
@@ -321,7 +321,12 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
client = ent->client;
 
if ( client->sess.spectatorState != SPECTATOR_FOLLOW ) {
-   client->ps.pm_type = PM_SPECTATOR;
+   if ( client->noclip ) {
+   client->ps.pm_type = PM_NOCLIP;
+   } else {
+   client->ps.pm_type = PM_SPECTATOR;
+   }
+
client->ps.speed = 400; // faster than normal
 
// set up for pmove

-- 
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/50: OpenGL2: Remove SF_VAO_MESH.

[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 e03cdf444c687b2291c4f5b91684e5f3d46cf79a
Author: SmileTheory 
Date:   Fri Jun 16 16:52:53 2017 -0700

OpenGL2: Remove SF_VAO_MESH.
---
 code/renderergl2/tr_light.c   |  1 -
 code/renderergl2/tr_local.h   | 10 +-
 code/renderergl2/tr_surface.c | 36 
 code/renderergl2/tr_world.c   |  2 --
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index cf4c0b5..f188626 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -99,7 +99,6 @@ void R_DlightBmodel( bmodel_t *bmodel ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
-   case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = 
mask;
break;
 
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index b8f34df..7e8e4b7 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -850,7 +850,6 @@ typedef enum {
SF_IQM,
SF_FLARE,
SF_ENTITY,  // beams, rails, lightning, etc 
that can be determined by entity
-   SF_VAO_MESH,
SF_VAO_MDVMESH,
 
SF_NUM_SURFACE_TYPES,
@@ -903,7 +902,7 @@ typedef struct
 
 #define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 
0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}
 
-// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, SF_POLY, and SF_VAO_MESH
+// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, and SF_POLY
 typedef struct srfBspSurface_s
 {
surfaceType_t   surfaceType;
@@ -925,13 +924,6 @@ typedef struct srfBspSurface_s
// vertexes
int numVerts;
srfVert_t  *verts;
-
-   // BSP VBO offsets
-   int firstVert;
-   int firstIndex;
-
-   // static render data
-   vao_t  *vao;

// SF_GRID specific variables after here
 
diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index 0fc0e0a..e123b54 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -451,35 +451,6 @@ static qboolean RB_SurfaceVaoCached(int numVerts, 
srfVert_t *verts, int numIndex
 }
 
 
-static qboolean RB_SurfaceVao(vao_t *vao, int numVerts, int numIndexes, int 
firstIndex, int dlightBits, int pshadowBits, qboolean shaderCheck)
-{
-   if (!vao)
-   {
-   return qfalse;
-   }
-
-   if (shaderCheck && !(!ShaderRequiresCPUDeforms(tess.shader) && 
!tess.shader->isSky && !tess.shader->isPortal))
-   {
-   return qfalse;
-   }
-
-   RB_CheckVao(vao);
-
-   tess.dlightBits |= dlightBits;
-   tess.pshadowBits |= pshadowBits;
-
-   RB_EndSurface();
-   RB_BeginSurface(tess.shader, tess.fogNum, tess.cubemapIndex);
-
-   backEnd.pc.c_staticVaoDraws++;
-
-   tess.numIndexes = numIndexes;
-   tess.numVertexes = numVerts;
-
-   return qtrue;
-}
-
-
 /*
 =
 RB_SurfaceTriangles
@@ -1236,12 +1207,6 @@ static void RB_SurfaceFlare(srfFlare_t *surf)
RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 
surf->normal);
 }
 
-static void RB_SurfaceVaoMesh(srfBspSurface_t * srf)
-{
-   RB_SurfaceVao (srf->vao, srf->numVerts, srf->numIndexes, 
srf->firstIndex,
-   srf->dlightBits, srf->pshadowBits, qfalse );
-}
-
 void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
 {
//mdvModel_t *mdvModel;
@@ -1348,6 +1313,5 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
(void(*)(void*))RB_IQMSurfaceAnim,  // SF_IQM,
(void(*)(void*))RB_SurfaceFlare,// SF_FLARE,
(void(*)(void*))RB_SurfaceEntity,   // SF_ENTITY
-   (void(*)(void*))RB_SurfaceVaoMesh,  // SF_VAO_MESH,
(void(*)(void*))RB_SurfaceVaoMdvMesh,   // SF_VAO_MDVMESH
 };
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 3821bee..f9a2442 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -213,7 +213,6 @@ static int R_DlightSurface( msurface_t *surf, int 
dlightBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
-   case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = 
dlightBits;
break;
 
@@ -299,7 +298,6 @@ static int R_PshadowSurface( msurface_t *surf, int 
pshadowBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
-   case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->pshadowBits = 

[ioquake3] 03/50: Fix Team Arena team base models not dropping to floor

[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 f19efb77c8cae5768cbcf1e96448a7dad108e2bb
Author: Zack Middleton 
Date:   Sat Jun 24 19:31:23 2017 -0500

Fix Team Arena team base models not dropping to floor

Team Arena's Overload gametype has red and blue team Obelisk base
objects. It uses separate entities for visual and damage. Only the
damageable entity was dropped to floor. Leaving model floating off
the ground.

Team Arena's Harvester base has the same problem. Model entity
floats in air but trigger entity drops to floor.

Drop all Team Arena team base models to floor. Fixes CTF, 1Flag,
Overload, and Harvester base models.
---
 code/game/g_team.c | 54 +-
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/code/game/g_team.c b/code/game/g_team.c
index 12d9f6a..7e0e90b 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -1313,9 +1313,8 @@ static void ObeliskPain( gentity_t *self, gentity_t 
*attacker, int damage ) {
AddScore(attacker, self->r.currentOrigin, actualDamage);
 }
 
-gentity_t *SpawnObelisk( vec3_t origin, int team, int spawnflags) {
-   trace_t tr;
-   vec3_t  dest;
+// spawn invisible damagable obelisk entity / harvester base trigger.
+gentity_t *SpawnObelisk( vec3_t origin, vec3_t mins, vec3_t maxs, int team ) {
gentity_t   *ent;
 
ent = G_Spawn();
@@ -1324,8 +1323,8 @@ gentity_t *SpawnObelisk( vec3_t origin, int team, int 
spawnflags) {
VectorCopy( origin, ent->s.pos.trBase );
VectorCopy( origin, ent->r.currentOrigin );
 
-   VectorSet( ent->r.mins, -15, -15, 0 );
-   VectorSet( ent->r.maxs, 15, 15, 87 );
+   VectorCopy( mins, ent->r.mins );
+   VectorCopy( maxs, ent->r.maxs );
 
ent->s.eType = ET_GENERAL;
ent->flags = FL_NO_KNOCKBACK;
@@ -1344,7 +1343,26 @@ gentity_t *SpawnObelisk( vec3_t origin, int team, int 
spawnflags) {
ent->touch = ObeliskTouch;
}
 
-   if ( spawnflags & 1 ) {
+   G_SetOrigin( ent, ent->s.origin );
+
+   ent->spawnflags = team;
+
+   trap_LinkEntity( ent );
+
+   return ent;
+}
+
+// setup entity for team base model / obelisk model.
+void ObeliskInit( gentity_t *ent ) {
+   trace_t tr;
+   vec3_t dest;
+
+   ent->s.eType = ET_TEAM;
+
+   VectorSet( ent->r.mins, -15, -15, 0 );
+   VectorSet( ent->r.maxs, 15, 15, 87 );
+
+   if ( ent->spawnflags & 1 ) {
// suspended
G_SetOrigin( ent, ent->s.origin );
} else {
@@ -1368,12 +1386,6 @@ gentity_t *SpawnObelisk( vec3_t origin, int team, int 
spawnflags) {
G_SetOrigin( ent, tr.endpos );
}
}
-
-   ent->spawnflags = team;
-
-   trap_LinkEntity( ent );
-
-   return ent;
 }
 
 /*QUAKED team_redobelisk (1 0 0) (-16 -16 0) (16 16 8)
@@ -1385,16 +1397,16 @@ void SP_team_redobelisk( gentity_t *ent ) {
G_FreeEntity(ent);
return;
}
-   ent->s.eType = ET_TEAM;
+   ObeliskInit( ent );
if ( g_gametype.integer == GT_OBELISK ) {
-   obelisk = SpawnObelisk( ent->s.origin, TEAM_RED, 
ent->spawnflags );
+   obelisk = SpawnObelisk( ent->s.origin, ent->r.mins, 
ent->r.maxs, TEAM_RED );
obelisk->activator = ent;
// initial obelisk health value
ent->s.modelindex2 = 0xff;
ent->s.frame = 0;
}
if ( g_gametype.integer == GT_HARVESTER ) {
-   obelisk = SpawnObelisk( ent->s.origin, TEAM_RED, 
ent->spawnflags );
+   obelisk = SpawnObelisk( ent->s.origin, ent->r.mins, 
ent->r.maxs, TEAM_RED );
obelisk->activator = ent;
}
ent->s.modelindex = TEAM_RED;
@@ -1410,16 +1422,16 @@ void SP_team_blueobelisk( gentity_t *ent ) {
G_FreeEntity(ent);
return;
}
-   ent->s.eType = ET_TEAM;
+   ObeliskInit( ent );
if ( g_gametype.integer == GT_OBELISK ) {
-   obelisk = SpawnObelisk( ent->s.origin, TEAM_BLUE, 
ent->spawnflags );
+   obelisk = SpawnObelisk( ent->s.origin, ent->r.mins, 
ent->r.maxs, TEAM_BLUE );
obelisk->activator = ent;
// initial obelisk health value
ent->s.modelindex2 = 0xff;
ent->s.frame = 0;
}
if ( g_gametype.integer == GT_HARVESTER ) {
-   obelisk = SpawnObelisk( ent->s.origin, TEAM_BLUE, 
ent->spawnflags );
+   obelisk = SpawnObelisk( ent->s.origin, ent->r.mins, 
ent->r.maxs, TEAM_BLUE );
obelisk->activator = ent;
}
ent->s.modelindex = TEAM_BLUE;
@@ -1433,10 +1445,10 @@ void SP_team_neutralobelisk( gentity_t *ent ) {
 

[ioquake3] branch debian/master updated (8a2eb42 -> 5232119)

[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  8a2eb42   Declare compliance with Debian Policy 4.0.0
   new  e03cdf4   OpenGL2: Remove SF_VAO_MESH.
   new  f7c3276   Fix g_teamAutoJoin and g_teamForceBalance
   new  f19efb7   Fix Team Arena team base models not dropping to floor
   new  520b100   Make cg_teamChatsOnly only affect team gametypes
   new  c2ca5e7   Check for unlimited time power up using INT_MAX
   new  7b9ccd1   Have spectator always be in first person
   new  03336dd   Allow spectators to use noclip cheat
   new  2e5c4bd   travis-ci: Don't run coverity_scan on master branch
   new  ccfc901   travis-ci: Upgrade to docker build system
   new  007e250   Split G_AddRandomBot into multiple functions
   new  23a331c   Make 'addbot random' command select a random bot info
   new  5164969   Fix random bot not looking for bots by funname
   new  d0d1fe1   Fix bot_minplayers passing delay as team to addbot in 
non-team gametypes
   new  7c601da   Fix not adding random bot when all bot info are in use on 
team
   new  d8f2ff7   Check delayed bot's team when counting bots for 
bot_minplayers
   new  0999aff   Fix duplicate (delayed) random bots being choosen
   new  cabc323   Don't pick duplicate random bots until all bot types are 
added
   new  b984dd4   Add range check for bot skill in addbot command
   new  4b5067c   Add 'addbot random' to README
   new  09a23e0   OpenGL2: Fix checking r_shadowCascadeZFar pointer instead 
of value
   new  102c79e   OpenGL2: Fix black planar projection shadows (cg_shadows 
3)
   new  e771537   OpenGL2: Draw sun shadows for first person IQM player 
models
   new  d9c2e91   Fix q3_ui cursor going off screen in widescreen
   new  21eeaee   Make Team Arena UI aspect correct in widescreen
   new  0ba359c   Make UI continue searching for local servers until found
   new  8c3d1fc   Allow changing q3_ui server source during refresh
   new  cbd9e43   Fix nonresponsive favorites in q3_ui having no hostname
   new  5aa7fb3   OpenGL2: Remove two unused cvars and update readme
   new  4dffc52   Add warnings for animMap and videoMap shader keywords
   new  904bbc1   Allow more than 32 surfaces in skin files
   new  dd73e19   Improve warning for too many skin surfaces
   new  7c25206   Fix set-but-not-used variable warnings in vm_armv7l.c
   new  a33a904   Fix warning about using abs() with floats (#222)
   new  e78da55   Fix more maybe-uninitialized warnings in opusfile
   new  51ca4d3   Fix misleading-indentation warnings in cl_cin.c
   new  d549b64   OpenGL2: Use an OpenGL 3.2 core context if available.
   new  a4c0923   OpenGL2: Remove GLSL_ValidateProgram().
   new  6a77f4e   OpenGL2: Don't do MSAA resolve/shadow mask/SSAO on shadow 
views.
   new  6f1712d   OpenGL2: "Fix" cg_shadows 4.
   new  786f6fc   whoops, left a bit of debugging enabled
   new  c8db6c5   Fix score bonus for defending the flag carrier in CTF
   new  13831f9   Restore not giving defense score bonus to flag carrier
   new  5f2e4a0   Add score bonus for defending the flag carrier in 1 Flag 
CTF
   new  fa1549d   Move CON_Init ahead of Com_Init to avoid Windows 
dedicated server crash
   new  9f239d6   Make 'globalservers 0' fetch all masters
   new  67dace6   Escape quotes for sv_dlURL in shell so it doesn't become 
"http:"
   new  64cb8bf   New upstream version 1.36+u20170720+dfsg1
   new  204b03d   Updated version 1.36+u20170720+dfsg1 from 
'upstream/1.36+u20170720+dfsg1'
   new  8c7a839   New upstream snapshot
   new  5232119   1.36+u20170720+dfsg1-1

The 50 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:
 .travis.yml  |  24 ++-
 README.md|   2 +
 code/cgame/cg_draw.c |  11 +-
 code/cgame/cg_newdraw.c  |  11 +-
 code/cgame/cg_servercmds.c   |  45 ++--
 code/cgame/cg_view.c |   3 +-
 code/client/cl_cin.c |  16 +-
 code/client/cl_main.c|  37 +++-
 code/game/ai_dmq3.c  |   7 +-
 code/game/g_active.c |   7 +-
 code/game/g_bot.c| 212 ---
 code/game/g_client.c |  40 ++--
 code/game/g_cmds.c   |   6 +-
 code/game/g_local.h  |   4 +-
 code/game/g_main.c   |   4 +-
 code/game/g_session.c|  27 ++-
 code/game/g_team.c   |  80 +++
 code/q3_ui/ui_atoms.c 

[ioquake3] 02/50: Fix g_teamAutoJoin and g_teamForceBalance

[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 f7c3276fe803388bd613ab6bf6ad8e0a6647b740
Author: Zack Middleton 
Date:   Thu Jun 22 21:56:00 2017 -0500

Fix g_teamAutoJoin and g_teamForceBalance

There are various issues caused by not knowing the initial team for
the local client and bots when they connect. This is can be reproduced
by starting a team game from the main menu.

When g_teamAutoJoin is enabled, bots and local client join a random
team at connect and then execute their team command a few frames
later. This may result in the player being killed if they specify a
different team. In Team Arena's Harvester mode this causes harvester
skulls to be spawned at the beginning of the game.

When g_teamForceBalance is enabled, the local client and bots may not
be able to join their desired team. This may result in them being
spectators. If g_teamAutoJoin is also enabled they may be left on
the opposite (red/blue) team they were meant to join.

There is a hack for including bot's team in their player info string
(used by cgame for which team skin to use) before the bot joins
their desired team. Bots aren't guaranteed to join their desired team
(as may happen when both g_teamAutoJoin and g_teamForceBalance are
enabled) so clients may see them as being on the wrong team!



Add teampref userinfo option for team preference. If teampref is set
it will be used for attempting to join the team immediately at connect.

Bots now join team at connect using teampref userinfo. So remove
the hack for setting bot's team in player info string before the bot
joins the team.

To avoid the client sending teampref userinfo to all network servers,
the local client uses a g_localTeamPref cvar. The g_localTeamPref
cvar is cleared after it's used so it doesn't get used when starting
another server later. Another reason not to use a teampref userinfo
cvar is there isn't a reliable way to clear it in CGame/UI which are
likely loaded from baseq3 pk3.

Make it so g_teamAutoJoin doesn't affect clients who specify
teampref. If teampref is invalid, the client will join a random team
like g_teamAutoJoin.

Don't apply g_teamForceBalance to the local client or bots. Otherwise
they may be left as spectators when starting team game from menu.

The start server menus use team command and g_localTeamPref to set
the human player's team. This way it's compatible with vanilla Q3
game VMs and the new setting team at connect feature.
---
 code/game/ai_dmq3.c |  7 +--
 code/game/g_bot.c   |  3 +--
 code/game/g_client.c| 40 
 code/game/g_cmds.c  |  6 +++---
 code/game/g_local.h |  4 ++--
 code/game/g_main.c  |  4 +++-
 code/game/g_session.c   | 27 +++
 code/q3_ui/ui_main.c|  7 ++-
 code/q3_ui/ui_startserver.c |  4 
 code/ui/ui_main.c   |  9 +
 10 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c
index 5198cb3..6e79665 100644
--- a/code/game/ai_dmq3.c
+++ b/code/game/ai_dmq3.c
@@ -5218,7 +5218,7 @@ BotDeathmatchAI
 ==
 */
 void BotDeathmatchAI(bot_state_t *bs, float thinktime) {
-   char gender[144], name[144], buf[144];
+   char gender[144], name[144];
char userinfo[MAX_INFO_STRING];
int i;
 
@@ -5232,11 +5232,6 @@ void BotDeathmatchAI(bot_state_t *bs, float thinktime) {
trap_GetUserinfo(bs->client, userinfo, sizeof(userinfo));
Info_SetValueForKey(userinfo, "sex", gender);
trap_SetUserinfo(bs->client, userinfo);
-   //set the team
-   if ( !bs->map_restart && g_gametype.integer != GT_TOURNAMENT ) {
-   Com_sprintf(buf, sizeof(buf), "team %s", 
bs->settings.team);
-   trap_EA_Command(bs->client, buf);
-   }
//set the chat gender
if (gender[0] == 'm') trap_BotSetChatGender(bs->cs, 
CHAT_GENDERMALE);
else if (gender[0] == 'f')  trap_BotSetChatGender(bs->cs, 
CHAT_GENDERFEMALE);
diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 6cc3917..c509772 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -542,7 +542,6 @@ qboolean G_BotConnect( int clientNum, qboolean restart ) {
 
Q_strncpyz( settings.characterfile, Info_ValueForKey( userinfo, 
"characterfile" ), sizeof(settings.characterfile) );
settings.skill = atof( Info_ValueForKey( userinfo, "skill" ) );
-   Q_strncpyz( settings.team, Info_ValueForKey( userinfo, "team" ), 
sizeof(settings.team) );
 
if (!BotAISetupClient( clientNum, , restart )) 

[higan] annotated tag debian/103-2 created (now e71fb90)

[Tobias Hansen]

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

thansen pushed a change to annotated tag debian/103-2
in repository higan.

at  e71fb90   (tag)
   tagging  eef0bf2990e477f875f70876124163201482ab0b (commit)
  replaces  debian/103-1
 tagged by  Tobias Hansen
on  Sun Jul 23 21:50:59 2017 +0100

- Log -
higan Debian release 103-2

Tobias Hansen (1):
  Apply sjlj-ftbfs.patch.

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.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

[higan] branch master updated (8068b35 -> eef0bf2)

[Tobias Hansen]

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

thansen pushed a change to branch master
in repository higan.

  from  8068b35   Upload higan 103-1 to Debian unstable.
   new  eef0bf2   Apply sjlj-ftbfs.patch.

The 1 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|  7 +++
 debian/patches/series   |  1 +
 debian/patches/sjlj-ftbfs.patch | 14 ++
 3 files changed, 22 insertions(+)
 create mode 100644 debian/patches/sjlj-ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.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

[higan] 01/01: Apply sjlj-ftbfs.patch.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository higan.

commit eef0bf2990e477f875f70876124163201482ab0b
Author: Tobias Hansen 
Date:   Sun Jul 23 21:49:07 2017 +0100

Apply sjlj-ftbfs.patch.
---
 debian/changelog|  7 +++
 debian/patches/series   |  1 +
 debian/patches/sjlj-ftbfs.patch | 14 ++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 52a7e9c..e1b06a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+higan (103-2) unstable; urgency=medium
+
+  * Apply sjlj-ftbfs.patch from Adrian Bunk (Closes: 869385)
+(Include settings.h for thread_local.)
+
+ -- Tobias Hansen   Sun, 23 Jul 2017 21:46:27 +0100
+
 higan (103-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index ca59900..54ade30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ create_config.patch
 include_cmath.patch
 disable-alsa-and-udev-on-non-linux.patch
 tomoko-makefile-fixes.patch
+sjlj-ftbfs.patch
diff --git a/debian/patches/sjlj-ftbfs.patch b/debian/patches/sjlj-ftbfs.patch
new file mode 100644
index 000..ae38878
--- /dev/null
+++ b/debian/patches/sjlj-ftbfs.patch
@@ -0,0 +1,14 @@
+Description: sjlj.c needs settings.h for thread_local
+Author: Adrian Bunk 
+Bug-Debian: https://bugs.debian.org/869385
+
+--- a/libco/sjlj.c
 b/libco/sjlj.c
+@@ -12,6 +12,7 @@
+ #define LIBCO_C
+ #define _XOPEN_SOURCE 700
+ #include "libco.h"
++#include "settings.h"
+ 
+ #include 
+ #include 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.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

[darkradiant] 04/06: Drop B-D on dh-autoreconf

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository darkradiant.

commit d55384c13f179221215cc5b14f39f11274455d95
Author: Tobias Frost 
Date:   Sun Jul 23 18:18:52 2017 +0200

Drop B-D on dh-autoreconf
---
 debian/changelog | 1 +
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f00e8fb..3ac1933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 darkradiant (2.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop B-D on dh-autoreconf
 
  -- Tobias Frost   Sun, 23 Jul 2017 17:29:32 +0200
 
diff --git a/debian/control b/debian/control
index d2d4818..669f2b1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: Debian Games Team 
 Uploaders: Tobias Frost 
 Build-Depends: debhelper (>= 10),
-   dh-autoreconf,
ftgl-dev,
gettext,
libalut-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] 05/06: Mark darkradiant-plugins-darkmod MultiArch:same

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository darkradiant.

commit 8684a2f149d1513f98f1357ade2052d891b9f4ad
Author: Tobias Frost 
Date:   Sun Jul 23 18:21:36 2017 +0200

Mark darkradiant-plugins-darkmod MultiArch:same
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ac1933..8362d49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ darkradiant (2.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop B-D on dh-autoreconf
+  * Mark darkradiant-plugins-darkmod MultiArch:same
 
  -- Tobias Frost   Sun, 23 Jul 2017 17:29:32 +0200
 
diff --git a/debian/control b/debian/control
index 669f2b1..aed06de 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Description: Level design toolchain for DOOM3 and The Dark Mod
 
 Package: darkradiant-plugins-darkmod
 Architecture: any
+Multi-Arch: same
 Depends: darkradiant (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: DarkMod-specific plugins for DarkRadiant
  DarkRadiant is a 3D map and level editor for idtech4 based games.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] 03/06: New upstream release 2.3.0

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository darkradiant.

commit ed25851a47733121bb93ce73da8cd93d5f6e25da
Author: Tobias Frost 
Date:   Sun Jul 23 17:30:08 2017 +0200

New upstream release 2.3.0
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 20cd909..f00e8fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+darkradiant (2.3.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Tobias Frost   Sun, 23 Jul 2017 17:29:32 +0200
+
 darkradiant (2.2.1-1) unstable; urgency=medium
 
   * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] 02/06: Merge tag 'upstream/2.3.0'

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository darkradiant.

commit 41cfe3ab5be37ad811ebab5d1034890432ca291e
Merge: 469bc84 d85dbfa
Author: Tobias Frost 
Date:   Sun Jul 23 17:29:20 2017 +0200

Merge tag 'upstream/2.3.0'

Upstream version 2.3.0

# gpg: Signatur vom So 23 Jul 2017 17:29:17 CEST
# gpg:mittels RSA-Schlüssel 
FDDD0CFF3864277630A2186C9164FA1D17BD5D36
# gpg:Aussteller "t...@coldtobi.de"
# gpg: Korrekte Signatur von "Tobias Frost " [ultimativ]
# gpg: alias "Tobias Frost " [ultimativ]
# gpg: alias "[jpeg image of size 5939]" [ultimativ]
# gpg: alias "Tobias Frost " 
[ultimativ]

 .gitignore |12 +
 Makefile.in|  1190 -
 PKGBUILD   | 7 +-
 README.md  |90 +-
 aclocal.m4 |  1501 --
 autogen.sh | 9 +-
 config.h.in|   125 -
 configure  | 25416 ---
 configure.ac   |11 +-
 include/ieventmanager.h| 5 +-
 include/igrid.h|18 +-
 include/igroupnode.h   |17 +-
 include/imainframelayout.h | 5 +
 include/imodule.h  |   141 +-
 include/inode.h| 3 +
 include/iregistry.h| 4 +
 include/iselection.h   |17 +-
 include/isound.h   |22 +-
 include/itextstream.h  |26 -
 include/iundo.h|18 +-
 include/version.h  | 2 +-
 install/bitmaps/darksplash.png |   Bin 152009 -> 370826 
bytes
 install/games/darkmod.game | 2 +-
 install/games/doom3-demo.game  | 2 +-
 install/games/doom3.game   | 2 +-
 install/games/quake3.game  | 2 +-
 install/games/quake4.game  | 2 +-
 install/games/xreal.game   | 2 +-
 install/i18n/darkradiant.pot   |  1209 +-
 install/i18n/de/LC_MESSAGES/darkradiant.mo |   Bin 101135 -> 101399 
bytes
 install/i18n/de/LC_MESSAGES/darkradiant.po |  1241 +-
 .../commands/check_for_invalid_visportals.py   |12 +-
 install/scripts/commands/patchsplitter.py  | 4 +-
 install/scripts/init.py| 4 +-
 install/ui/aboutdialog.fbp | 4 +-
 install/ui/aboutdialog.xrc | 4 +-
 install/ui/renderpreview.fbp   |   112 +-
 install/ui/renderpreview.xrc   |25 +-
 install/user.xml   | 6 +-
 libs/Makefile.in   |   711 -
 libs/ddslib/Makefile.in|   743 -
 libs/debugging/debugging.h |14 +-
 libs/math/FloatTools.h | 2 +-
 libs/math/Makefile.in  |  1197 -
 libs/os/dir.h  |13 +-
 libs/os/file.h |14 +-
 libs/os/fs.h   |79 +-
 libs/picomodel/Makefile.in |   816 -
 libs/picomodel/lwo/clip.c  | 6 +-
 libs/picomodel/lwo/envelope.c  | 4 +-
 libs/picomodel/lwo/list.c  | 2 +-
 libs/picomodel/lwo/lwio.c  | 2 +-
 libs/picomodel/lwo/lwo2.c  | 2 +-
 libs/picomodel/lwo/lwob.c  | 6 +-
 libs/picomodel/lwo/surface.c   |26 +-
 libs/picomodel/picomodel.c | 5 +-
 libs/picomodel/pm_3ds.c| 4 +-
 libs/picomodel/pm_ase.c| 2 +-
 libs/picomodel/pm_fm.c | 2 +-
 libs/picomodel/pm_obj.c| 2 +-
 libs/render/RenderableSpacePartition.h | 2 +-
 libs/scene/Makefile.in |   752 -
 libs/scene/Node.cpp| 4 +-
 libs/scene/Node.h  |50 +-
 libs/scene/TraversableNodeSet.cpp  

[darkradiant] branch upstream updated (df81e65 -> d85dbfa)

[Tobias Frost]

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

tobi pushed a change to branch upstream
in repository darkradiant.

  from  df81e65   New upstream version 2.2.1
   new  d85dbfa   New upstream version 2.3.0

The 1 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:
 .gitignore |12 +
 Makefile.in|  1190 -
 PKGBUILD   | 7 +-
 README.md  |90 +-
 aclocal.m4 |  1501 --
 autogen.sh | 9 +-
 config.h.in|   125 -
 configure  | 25416 ---
 configure.ac   |11 +-
 include/ieventmanager.h| 5 +-
 include/igrid.h|18 +-
 include/igroupnode.h   |17 +-
 include/imainframelayout.h | 5 +
 include/imodule.h  |   141 +-
 include/inode.h| 3 +
 include/iregistry.h| 4 +
 include/iselection.h   |17 +-
 include/isound.h   |22 +-
 include/itextstream.h  |26 -
 include/iundo.h|18 +-
 include/version.h  | 2 +-
 install/bitmaps/darksplash.png |   Bin 152009 -> 370826 
bytes
 install/games/darkmod.game | 2 +-
 install/games/doom3-demo.game  | 2 +-
 install/games/doom3.game   | 2 +-
 install/games/quake3.game  | 2 +-
 install/games/quake4.game  | 2 +-
 install/games/xreal.game   | 2 +-
 install/i18n/darkradiant.pot   |  1209 +-
 install/i18n/de/LC_MESSAGES/darkradiant.mo |   Bin 101135 -> 101399 
bytes
 install/i18n/de/LC_MESSAGES/darkradiant.po |  1241 +-
 .../commands/check_for_invalid_visportals.py   |12 +-
 install/scripts/commands/patchsplitter.py  | 4 +-
 install/scripts/init.py| 4 +-
 install/ui/aboutdialog.fbp | 4 +-
 install/ui/aboutdialog.xrc | 4 +-
 install/ui/renderpreview.fbp   |   112 +-
 install/ui/renderpreview.xrc   |25 +-
 install/user.xml   | 6 +-
 libs/Makefile.in   |   711 -
 libs/ddslib/Makefile.in|   743 -
 libs/debugging/debugging.h |14 +-
 libs/math/FloatTools.h | 2 +-
 libs/math/Makefile.in  |  1197 -
 libs/os/dir.h  |13 +-
 libs/os/file.h |14 +-
 libs/os/fs.h   |79 +-
 libs/picomodel/Makefile.in |   816 -
 libs/picomodel/lwo/clip.c  | 6 +-
 libs/picomodel/lwo/envelope.c  | 4 +-
 libs/picomodel/lwo/list.c  | 2 +-
 libs/picomodel/lwo/lwio.c  | 2 +-
 libs/picomodel/lwo/lwo2.c  | 2 +-
 libs/picomodel/lwo/lwob.c  | 6 +-
 libs/picomodel/lwo/surface.c   |26 +-
 libs/picomodel/picomodel.c | 5 +-
 libs/picomodel/pm_3ds.c| 4 +-
 libs/picomodel/pm_ase.c| 2 +-
 libs/picomodel/pm_fm.c | 2 +-
 libs/picomodel/pm_obj.c| 2 +-
 libs/render/RenderableSpacePartition.h | 2 +-
 libs/scene/Makefile.in |   752 -
 libs/scene/Node.cpp| 4 +-
 libs/scene/Node.h  |50 +-
 libs/scene/TraversableNodeSet.cpp  |15 +-
 libs/scene/TraversableNodeSet.h|14 +-
 libs/wxutil/ConsoleView.cpp| 2 +-
 libs/wxutil/Makefile.in|   884 -
 libs/wxutil/MouseToolHandler.cpp   |10 +
 libs/wxutil/TreeModel.cpp  |   152 +-
 libs/wxutil/TreeModel.h|   

[darkradiant] annotated tag upstream/2.3.0 created (now 0f0a269)

[Tobias Frost]

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

tobi pushed a change to annotated tag upstream/2.3.0
in repository darkradiant.

at  0f0a269   (tag)
   tagging  d85dbfa3af9bcdb97fe4603e47e98e3e42c173e2 (commit)
  replaces  upstream/2.2.1
 tagged by  Tobias Frost
on  Sun Jul 23 17:29:17 2017 +0200

- Log -
Upstream version 2.3.0
-BEGIN PGP SIGNATURE-

iQJFBAABCAAvFiEE/d0M/zhkJ3YwohhskWT6HRe9XTYFAll0wM0RHHRvYmlAY29s
ZHRvYmkuZGUACgkQkWT6HRe9XTYRphAAz8RY9l/2e3oFtG8Ti0KjzMD82TpITYVO
MJtxta7yh+Mp5D7zwkrDoCQR9+Sqjdah0EvcKkORNNfW/tEEoolzM2g9SDmQofB+
WWcqsMAqzEJDuG0b7BY7W6BinLWA20gM2kNjDA4ID2YAnwuPpc2SBK92VE/RWfyF
Mf40MLALOChIyNGI8TFJe+fDBPB6NIYrbD24B3Z/UP30L21XMmQfdPBa3P5f7MOV
6fs2eEYQYU7waTX6PjxCdjs2NYpUwUBLSjyQ9Hm5FCFPfVbRPqoy7ZRo9YGcNrwj
+xM5OVSZ0+U9xI2LctyGNmZyH5zqEDdk9xAImvpAGw7+MOThByc54Xb548DiAozF
8IEB+z4YBEAy8cjVMNqEl7Cs/U5cavYR1AUGKzt1zMrR8HaJ2Snj5eow6twHVk17
7NuWSN3H/G8NEwsPuF5OD+Oe7xgsSweOVAiQCw7oAl14PlwqumWX510Ur9aE9G1T
6ToZyESK1qE0LChO5VSx27Vr41NqcgTQ0Q66ipLE963AfElD8UZb1XMtGbnuD8mi
RRQvr86gqoc/gNo1PJYmTK8BmHj8MD/rUzSgUtZDphEpVy2u4Q675/f1pG4kMOu9
zpsaZyi/g0yFjBC8UXhibqBffswy83icecoZdn8E6x8cWrY6RTc7zDgWW8YsEv9f
qVbTscDJLTI=
=s8LV
-END PGP SIGNATURE-

Tobias Frost (1):
  New upstream version 2.3.0

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] annotated tag debian/2.3.0-1 created (now 069a738)

[Tobias Frost]

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

tobi pushed a change to annotated tag debian/2.3.0-1
in repository darkradiant.

at  069a738   (tag)
   tagging  06b1ba22d73304799b3e526826e04f82b660da9c (commit)
  replaces  debian/2.2.1-1
 tagged by  Tobias Frost
on  Sun Jul 23 18:40:28 2017 +0200

- Log -
darkradiant Debian release 2.3.0-1
-BEGIN PGP SIGNATURE-

iQJFBAABCAAvFiEE/d0M/zhkJ3YwohhskWT6HRe9XTYFAll00X0RHHRvYmlAY29s
ZHRvYmkuZGUACgkQkWT6HRe9XTYORw/+N9ftRkycKB0xRBrnxRVUsNErpBsHed1D
EMY96O6qJt0LxkW4phmuCT30EvTv/qa8V6g0sc9tLTdXo2oZEkXXhqMGNSLn59L+
ln4iSChWw7Q+5qpmT01ztwZEN/tJ5Alp3MSQuEcxhj0IXV9Lb6lUwJGSCN5sT20N
MnLJtEdAWADx1YseYTmZretjCZztqoNSqcmEsQJdiHGUwdywL51lUJ7DfMk8fiKa
F1URVREtIyyWiU9de2GPoRHBVMZQ6c+ltBlPx3B5HTt9kbp4nN4Bb46KWrczwXq1
UtDqXDsHTp/nBHjUXePqAVnMbH6Tg+2fGYT5QaaLppX3Z6zBelrLmDrtxRLAaVaa
QD2jv4y8RIoQbWkX73ZXUcwMQYM+Q47P0hWp9HkEudI3cmjDwSPFMNIDXfxs8qzd
nJe2zVaoS9Q10PxpIFM3lnor4PhRMD6SV0GRZHv5s2YCH6CQUmMfORY35+aUCZNc
qv6m1OiJI3xfaLgSZ16NUbCSYIjOD4nUekiaqGevnx2zj/oJ7GMcgNxf4fE2AwxK
kWkBGFAaLekFutVJdtiWB5+H3QYVr0EOTxZ8WN1Zsl0vJjKkG5h2/o7Ey8T+dv/j
nK2bxfV6K0z6BvRPP9cv3eDM476FcRr1wYIj6WAt2wF2ac+KJbvW1aHSEVk0Fu1E
JvOEwfUoGYo=
=WJdh
-END PGP SIGNATURE-

Tobias Frost (6):
  New upstream version 2.3.0
  Merge tag 'upstream/2.3.0'
  New upstream release 2.3.0
  Drop B-D on dh-autoreconf
  Mark darkradiant-plugins-darkmod MultiArch:same
  Release

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] 06/06: Release

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository darkradiant.

commit 06b1ba22d73304799b3e526826e04f82b660da9c
Author: Tobias Frost 
Date:   Sun Jul 23 18:25:00 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 8362d49..32089b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-darkradiant (2.3.0-1) UNRELEASED; urgency=medium
+darkradiant (2.3.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Drop B-D on dh-autoreconf
   * Mark darkradiant-plugins-darkmod MultiArch:same
 
- -- Tobias Frost   Sun, 23 Jul 2017 17:29:32 +0200
+ -- Tobias Frost   Sun, 23 Jul 2017 18:24:51 +0200
 
 darkradiant (2.2.1-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] 01/01: pristine-tar data for darkradiant_2.3.0.orig.tar.gz

[Tobias Frost]

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

tobi pushed a commit to branch pristine-tar
in repository darkradiant.

commit 10e35a89b2a5c696f1a58e627794e98e8ec8da1e
Author: Tobias Frost 
Date:   Sun Jul 23 17:29:17 2017 +0200

pristine-tar data for darkradiant_2.3.0.orig.tar.gz
---
 darkradiant_2.3.0.orig.tar.gz.delta | Bin 0 -> 80816 bytes
 darkradiant_2.3.0.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/darkradiant_2.3.0.orig.tar.gz.delta 
b/darkradiant_2.3.0.orig.tar.gz.delta
new file mode 100644
index 000..adf3618
Binary files /dev/null and b/darkradiant_2.3.0.orig.tar.gz.delta differ
diff --git a/darkradiant_2.3.0.orig.tar.gz.id b/darkradiant_2.3.0.orig.tar.gz.id
new file mode 100644
index 000..9ab472e
--- /dev/null
+++ b/darkradiant_2.3.0.orig.tar.gz.id
@@ -0,0 +1 @@
+3e1a0bb335ba904459e226af0f0be0e79212ce8e

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/darkradiant.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

[darkradiant] branch master updated (469bc84 -> 06b1ba2)

[Tobias Frost]

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

tobi pushed a change to branch master
in repository darkradiant.

  from  469bc84   Release 2.2.1-1
   new  d85dbfa   New upstream version 2.3.0
   new  41cfe3a   Merge tag 'upstream/2.3.0'
   new  ed25851   New upstream release 2.3.0
   new  d55384c   Drop B-D on dh-autoreconf
   new  8684a2f   Mark darkradiant-plugins-darkmod MultiArch:same
   new  06b1ba2   Release

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.


Summary of changes:
 .gitignore |12 +
 Makefile.in|  1190 -
 PKGBUILD   | 7 +-
 README.md  |90 +-
 aclocal.m4 |  1501 --
 autogen.sh | 9 +-
 config.h.in|   125 -
 configure  | 25416 ---
 configure.ac   |11 +-
 debian/changelog   | 8 +
 debian/control | 2 +-
 include/ieventmanager.h| 5 +-
 include/igrid.h|18 +-
 include/igroupnode.h   |17 +-
 include/imainframelayout.h | 5 +
 include/imodule.h  |   141 +-
 include/inode.h| 3 +
 include/iregistry.h| 4 +
 include/iselection.h   |17 +-
 include/isound.h   |22 +-
 include/itextstream.h  |26 -
 include/iundo.h|18 +-
 include/version.h  | 2 +-
 install/bitmaps/darksplash.png |   Bin 152009 -> 370826 
bytes
 install/games/darkmod.game | 2 +-
 install/games/doom3-demo.game  | 2 +-
 install/games/doom3.game   | 2 +-
 install/games/quake3.game  | 2 +-
 install/games/quake4.game  | 2 +-
 install/games/xreal.game   | 2 +-
 install/i18n/darkradiant.pot   |  1209 +-
 install/i18n/de/LC_MESSAGES/darkradiant.mo |   Bin 101135 -> 101399 
bytes
 install/i18n/de/LC_MESSAGES/darkradiant.po |  1241 +-
 .../commands/check_for_invalid_visportals.py   |12 +-
 install/scripts/commands/patchsplitter.py  | 4 +-
 install/scripts/init.py| 4 +-
 install/ui/aboutdialog.fbp | 4 +-
 install/ui/aboutdialog.xrc | 4 +-
 install/ui/renderpreview.fbp   |   112 +-
 install/ui/renderpreview.xrc   |25 +-
 install/user.xml   | 6 +-
 libs/Makefile.in   |   711 -
 libs/ddslib/Makefile.in|   743 -
 libs/debugging/debugging.h |14 +-
 libs/math/FloatTools.h | 2 +-
 libs/math/Makefile.in  |  1197 -
 libs/os/dir.h  |13 +-
 libs/os/file.h |14 +-
 libs/os/fs.h   |79 +-
 libs/picomodel/Makefile.in |   816 -
 libs/picomodel/lwo/clip.c  | 6 +-
 libs/picomodel/lwo/envelope.c  | 4 +-
 libs/picomodel/lwo/list.c  | 2 +-
 libs/picomodel/lwo/lwio.c  | 2 +-
 libs/picomodel/lwo/lwo2.c  | 2 +-
 libs/picomodel/lwo/lwob.c  | 6 +-
 libs/picomodel/lwo/surface.c   |26 +-
 libs/picomodel/picomodel.c | 5 +-
 libs/picomodel/pm_3ds.c| 4 +-
 libs/picomodel/pm_ase.c| 2 +-
 libs/picomodel/pm_fm.c | 2 +-
 libs/picomodel/pm_obj.c| 2 +-
 libs/render/RenderableSpacePartition.h | 2 +-
 libs/scene/Makefile.in |   752 -
 libs/scene/Node.cpp| 4 +-
 libs/scene/Node.h  |50 +-
 libs/scene/TraversableNodeSet.cpp  |15 +-
 

[game-data-packager] branch master updated (b2a33fe -> e8f57bb)

[Simon McVittie]

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

smcv pushed a change to branch master
in repository game-data-packager.

  from  b2a33fe   Update changelog
   new  e8f57bb   Add missing sha1 and sha256 hashes for files on Quake 4 
French retail DVD

The 1 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:
 data/quake4.yaml | 8 
 debian/changelog | 2 ++
 2 files changed, 10 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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

[game-data-packager] 01/01: Add missing sha1 and sha256 hashes for files on Quake 4 French retail DVD

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit e8f57bb462e20d37376fa860905d7fa208988301
Author: Simon McVittie 
Date:   Sun Jul 23 14:53:24 2017 +0100

Add missing sha1 and sha256 hashes for files on Quake 4 French retail DVD

This is described as the French original release. Thanks to nyav for
providing these. (Partially addresses: #808200)
---
 data/quake4.yaml | 8 
 debian/changelog | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/data/quake4.yaml b/data/quake4.yaml
index 4c1214e..6ef3b6c 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -919,6 +919,7 @@ sha1sums: |
   8822597ce83e976b317ea52a41675fcd71aa9de7  quake4smp.x86
   0f4749a12b38caed9013121f77e9f8a9b3cda0fa  sdl.patch.1.2.10
 
+  de2b6fabb8af24aa4a7fb4cc73370b2bba37e76a  q4base/game000.pk4?en_retail
   8fbe6ba4ee74c811afb74cb022a9cea5476c0384  q4base/pak001.pk4?interoperable
   e11bad54ec237a5fd5630fa899886bed6a0f5eee  q4base/pak002.pk4?interoperable
   75b55dce73e30b2293989f44e43607329199e843  q4base/pak003.pk4?interoperable
@@ -932,10 +933,14 @@ sha1sums: |
   953bbfdfad1e441b98eeb9ad8c77b7e43d3c2d36  q4base/pak011.pk4?interoperable
   83cf52bac477b75cf57faf9c255e0ae465f978bb  q4base/pak012.pk4?interoperable
   6b670700070d922968d0bd11c421da90a046c522  
q4base/zpak_english.pk4?interoperable
+  30dca0a44ab2520ce6d9da1884298866cb000ab9  q4base/zpak_french.pk4
+  cb9265c4e00cb3c6d770b1f00a2add50ed006b19  q4base/zpak_italian.pk4
+  f93401bead1ea929878aef014453eebdfdb5a313  q4base/zpak_spanish.pk4
 
 sha256sums: |
   9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a  
quake4-linux-1.4.2.x86.run
   cc8d3b7279cce790d4c594931d21080509b1e2d7297f7a797544606cecf057b6  
quake4-linux-1.4.2.x86.run.gz
+  1f3da944af38955a92b98c58faef299a6554511c1d31371d2b97a60654630bcb  
q4base/game000.pk4?en_retail
   507be913e3bfc292d0cf246f359a32e00e08cfaf1b436f06c1416e5e45b9306a  
q4base/pak001.pk4?interoperable
   c26827263ec4a9a3c04fd06441dcf49358984ab01abad0fcc483935402dc  
q4base/pak002.pk4?interoperable
   09bee32a86f23afef299c3581383f79c0c2c06b565fdb21ce0b3d032144ebf7c  
q4base/pak003.pk4?interoperable
@@ -949,6 +954,9 @@ sha256sums: |
   cc62f136a0c34052bb09802d2a35692dc61a42455c7d9d0e8b23cec9b6920205  
q4base/pak011.pk4?interoperable
   af8b0a1be45cc43ed3fe1c3ac89e80ddc5e01ea81eb988bc9678d4dbb19e8031  
q4base/pak012.pk4?interoperable
   2d69f171e7d107730ebb8da329ca34d33a0de64fd14c8ac0816068b23c66cf77  
q4base/zpak_english.pk4?interoperable
+  d0b046ce92de314b4363fb9319e67463ec97587b6302fc0b7350df9ca688e9e7  
q4base/zpak_french.pk4
+  aea0db982e1826a1c6755950a9707a2154e48829d73a78a22e09b8b330d68187  
q4base/zpak_italian.pk4
+  55645b86f8bc7c0e4d54b44d2b30a649dc8617fa6ca40dab27b7f7f4642f642c  
q4base/zpak_spanish.pk4
 
 sha512sums: |
   
a6a390a8f46c7e696fe865d0688c9a95eb0d9e32ad62ecb796dcc03618994ec065e8c74358518221cb6c8771d2414ed7e144c77a1a8ecd4ae9ce6406459c5f36
  quake4-linux-1.4.2.x86.run
diff --git a/debian/changelog b/debian/changelog
index 20964da..9d0c747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ game-data-packager (54) UNRELEASED; urgency=medium
   * Internal changes:
 - Skip some of the more elaborate consistency checks when running a
   packaged version [smcv]
+- Add missing sha1 and sha256 hashes for files on Quake 4 French
+  retail DVD, partially addressing #808200. Thanks, nyav [smcv]
 
  -- Simon McVittie   Wed, 05 Jul 2017 08:31:13 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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

[game-data-packager] 01/03: Make it easier to mix "compiled" VFS bits with source YAML

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 86d0a9512d326bfbdbe4af6cd652642b513518c6
Author: Simon McVittie 
Date:   Mon Jul 17 00:39:03 2017 +0100

Make it easier to mix "compiled" VFS bits with source YAML

We seem to get occasional bug reports from people who have edited
the compiled/optimized versions of the data files. These are not
intended to be editable, and incorporating changes to them require
working out what change to the YAML was intended.

To make it easier for potential contributors to try out changes,
load YAML files from alongside vfs.zip if they exist.
---
 game_data_packager/__init__.py | 100 -
 game_data_packager/paths.py|   2 -
 tools/check_equivalence.py |   8 ++--
 3 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 721914b..f802586 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -33,7 +33,7 @@ import yaml
 from .build import (PackagingTask)
 from .data import (FileGroup, Package, WantedFile)
 from .packaging import (NoPackaging)
-from .paths import (DATADIR, USE_VFS)
+from .paths import (DATADIR)
 from .util import ascii_safe
 from .version import (GAME_PACKAGE_VERSION)
 
@@ -594,14 +594,78 @@ class GameData(object):
 current_group.apply_group_attributes(f)
 current_group.group_members.add(f.name)
 
-def load_file_data(self, use_vfs=USE_VFS,
-check=('GDP_UNINSTALLED' in os.environ)):
+def load_file_data(self,
+check=('GDP_UNINSTALLED' in os.environ),
+datadir=DATADIR,
+use_vfs=True):
 if self.loaded_file_data:
 return
 
 logger.debug('loading full data')
 
-if use_vfs:
+yamlfile = os.path.join(datadir, self.shortname + '.yaml')
+
+if os.path.exists(yamlfile):
+yamldata = open(yamlfile, encoding='utf-8').read()
+data = yaml.load(yamldata, Loader=yaml.CSafeLoader)
+
+for group_name, group_data in sorted(
+data.get('groups', {}).items()):
+group = self._ensure_group(group_name)
+
+if isinstance(group_data, dict):
+members = group_data['group_members']
+for k, v in group_data.items():
+if k != 'group_members':
+setattr(group, k, v)
+elif isinstance(group_data, (str, list)):
+members = group_data
+else:
+raise AssertionError(
+'group %r should be dict, str or list' % group_name)
+
+has_members = False
+
+if isinstance(members, str):
+for line in members.splitlines():
+line = line.strip()
+if line and not line.startswith('#'):
+has_members = True
+f = self._add_hash(line, 'size_and_md5')
+# f can either be a WantedFile or a FileGroup here
+group.apply_group_attributes(f)
+group.group_members.add(f.name)
+elif isinstance(members, list):
+for m in members:
+has_members = True
+f = self._add_hash('? ? ' + m, 'size_and_md5')
+# f can either be a WantedFile or a FileGroup here
+group.apply_group_attributes(f)
+group.group_members.add(f.name)
+else:
+raise AssertionError(
+'group %r members should be str or list' % group_name)
+
+# an empty group is no use, and would break the assumption
+# that we can use f.group_members to detect groups
+assert has_members
+
+for k in ('sha1sums', 'sha256sums', 'size_and_md5'):
+v = data.get(k, None)
+
+if k.endswith('sums'):
+k = k[:-4]
+
+if v is not None:
+for line in v.splitlines():
+stripped = line.strip()
+
+if stripped == '' or stripped.startswith('#'):
+continue
+
+self._add_hash(stripped, k)
+
+elif use_vfs:
 if isinstance(use_vfs, str):
 zip = use_vfs
 else:
@@ -900,32 +964,42 @@ class GameData(object):
 return
 return gog.get('game') or gog.get('url')
 
-def load_games(game='*', use_vfs=USE_VFS, use_yaml=False):
+def load_games(game='*', datadir=DATADIR, 

[game-data-packager] 03/03: Update changelog

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit b2a33fe4795b2b9c8a99dbf47523b5a573f30ab6
Author: Simon McVittie 
Date:   Mon Jul 17 00:42:32 2017 +0100

Update changelog
---
 debian/changelog | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8270c9a..20964da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,13 @@ game-data-packager (54) UNRELEASED; urgency=medium
   of them being included and the other being omitted. [smcv]
 - Add a consistency check to prevent the above happening again [smcv]
 - morrowind: Do not issue warnings about a modified Morrowind.ini [smcv]
-- GOG: make distro agnostic the help text about missing
-  lgogdownload & innoextract utilities [adetiste]
+- GOG: make the help text about missing lgogdownload and innoextract
+  utilities distro-agnostic [adetiste]
+- If a source YAML file (from game-data-packager's source code) is
+  placed next to vfs.zip, load it preferentially. Add comments to
+  derived files (except the JSON, which uses monstrously long lines
+  and so is hopefully clearly not intended to be human-readable, let
+  alone editable) indicating what to do instead of editing them. [smcv]
   * Internal changes:
 - Skip some of the more elaborate consistency checks when running a
   packaged version [smcv]

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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

[game-data-packager] 02/03: compile_yaml: Make it clearer that these files are not for editing

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 41011f3457b737b4c65448850c42b655719f02a1
Author: Simon McVittie 
Date:   Mon Jul 17 00:40:07 2017 +0100

compile_yaml: Make it clearer that these files are not for editing

Hopefully by hinting to potential contributors that there is a source
format for these files, we can waste less of their time on editing
non-editable formats.
---
 tools/compile_yaml.py | 9 +
 1 file changed, 9 insertions(+)

diff --git a/tools/compile_yaml.py b/tools/compile_yaml.py
index 698fa7e..ce1676c 100755
--- a/tools/compile_yaml.py
+++ b/tools/compile_yaml.py
@@ -45,6 +45,10 @@ def main(f, out):
 
 if groups is not None:
 with open(offload + '.tmp', 'w', encoding='utf-8') as writer:
+writer.write('# Generated file, do not edit.\n')
+writer.write(
+'# Edit %s.yaml and put it next to vfs.zip instead.\n' % game)
+
 assert isinstance(groups, dict)
 # The group data starts with a list of groups. This is necessary
 # so we can know whether a group member, encountered later on in
@@ -101,6 +105,11 @@ def main(f, out):
 
 if v is not None:
 with open(offload + '.tmp', 'w', encoding='utf-8') as writer:
+writer.write('# Generated file, do not edit.\n')
+writer.write(
+'# Edit %s.yaml and put it next to vfs.zip instead.\n' %
+game)
+
 for line in v.splitlines():
 stripped = line.strip()
 if stripped == '' or stripped.startswith('#'):

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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

r15989 - in packages/tags/sdl-ball: . 1.02-2/debian

[Evgeni Golov]

Author: evgeni
Date: 2017-07-23 12:56:58 + (Sun, 23 Jul 2017)
New Revision: 15989

Added:
   packages/tags/sdl-ball/1.02-2/
   packages/tags/sdl-ball/1.02-2/debian/changelog
   packages/tags/sdl-ball/1.02-2/debian/control
Removed:
   packages/tags/sdl-ball/1.02-2/debian/changelog
   packages/tags/sdl-ball/1.02-2/debian/control
Log:
[svn-buildpackage] Tagging sdl-ball 1.02-2

Deleted: packages/tags/sdl-ball/1.02-2/debian/changelog
===
--- packages/trunk/sdl-ball/debian/changelog2017-07-19 13:32:50 UTC (rev 
15985)
+++ packages/tags/sdl-ball/1.02-2/debian/changelog  2017-07-23 12:56:58 UTC 
(rev 15989)
@@ -1,75 +0,0 @@
-sdl-ball (1.02-1) experimental; urgency=medium
-
-  * New upstream release.
-  * Drop obsolete patches:
-- debian/patches/gcc-4.7-ftbfs.patch
-- debian/patches/gcc-4.8-ftbfs.patch
-  * Use upstream's sdl-ball.desktop
-  * Standards-Version: 3.9.6
-  * Depend on fonts-alee instead of ttf-alee (Closes: #768604)
-
- -- Evgeni Golov   Sun, 16 Nov 2014 14:18:06 +0100
-
-sdl-ball (1.01-4) unstable; urgency=low
-
-  * Fix FTBFS with gcc 4.8 due to stray ‘,’.
-Thanks: Juhani Numminen 
-Closes: #701355
-  * Use canonical URLs in Vcs-* entries.
-  * Use debhelper 9 compat.
-  * Honour CPPFLAGS from dpkg-buildflags to properly harden the build.
-  * Standards-Version: 3.9.4
-  * Improve the desktop file.
-
- -- Evgeni Golov   Sun, 23 Jun 2013 14:09:01 +0200
-
-sdl-ball (1.01-3) unstable; urgency=low
-
-  * Fix FTBFS due to wrong use of the override targets of dh.
-Thanks: Nobuhiro Iwamatsu 
-Closes: #673938
-
- -- Evgeni Golov   Sun, 27 May 2012 12:53:43 +0200
-
-sdl-ball (1.01-2) unstable; urgency=low
-
-  [ Evgeni Golov ]
-  * Update my email address.
-  * Use dh rules.tiny
-  * format 3.0 (quilt)
-  * Standards-Version: 3.9.3
-  * Update debian/changelog to the latest format specification.
-  * Fix a small spelling typo (Dont → Don't) in the game, thanks lintian.
-
-  [ Cyril Brulebois ]
-  * Fix FTBFS with gcc 4.7 by fixing missing  include
-(Closes: #667368).
-
- -- Evgeni Golov   Tue, 15 May 2012 07:09:01 +0200
-
-sdl-ball (1.01-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/copyright:
-+ Fix the link to upstream source, this is sdl-ball, not sdl-jump.
-  Closes: #509621.
-+ Add copyright information for the dio-theme.
-+ Update copyright years.
-
- -- Evgeni Golov   Thu, 22 Jan 2009 19:00:10 +0100
-
-sdl-ball (0.14-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/rules:
-+ Use themes/default/icon32.png instead of icon32.png as the icon.
-  * debian/control:
-+ Add ${misc:Depends} to Depends of sdl-ball-data to please lintian.
-
- -- Evgeni Golov   Mon, 08 Dec 2008 09:41:38 +0100
-
-sdl-ball (0.13-1) unstable; urgency=low
-
-  * Initial release (Closes: #505447)
-
- -- Evgeni Golov   Wed, 12 Nov 2008 14:25:49 +0100

Copied: packages/tags/sdl-ball/1.02-2/debian/changelog (from rev 15988, 
packages/trunk/sdl-ball/debian/changelog)
===
--- packages/tags/sdl-ball/1.02-2/debian/changelog  
(rev 0)
+++ packages/tags/sdl-ball/1.02-2/debian/changelog  2017-07-23 12:56:58 UTC 
(rev 15989)
@@ -0,0 +1,83 @@
+sdl-ball (1.02-2) unstable; urgency=medium
+
+  * Upload to unstable.
+  * use https for vsc-browser
+  * Standards-Version: 4.0.0
+
+ -- Evgeni Golov   Sun, 23 Jul 2017 14:35:41 +0200
+
+sdl-ball (1.02-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop obsolete patches:
+- debian/patches/gcc-4.7-ftbfs.patch
+- debian/patches/gcc-4.8-ftbfs.patch
+  * Use upstream's sdl-ball.desktop
+  * Standards-Version: 3.9.6
+  * Depend on fonts-alee instead of ttf-alee (Closes: #768604)
+
+ -- Evgeni Golov   Sun, 16 Nov 2014 14:18:06 +0100
+
+sdl-ball (1.01-4) unstable; urgency=low
+
+  * Fix FTBFS with gcc 4.8 due to stray ‘,’.
+Thanks: Juhani Numminen 
+Closes: #701355
+  * Use canonical URLs in Vcs-* entries.
+  * Use debhelper 9 compat.
+  * Honour CPPFLAGS from dpkg-buildflags to properly harden the build.
+  * Standards-Version: 3.9.4
+  * Improve the desktop file.
+
+ -- Evgeni Golov   Sun, 23 Jun 2013 14:09:01 +0200
+
+sdl-ball (1.01-3) unstable; urgency=low
+
+  * Fix FTBFS due to wrong use of the override targets of dh.
+Thanks: Nobuhiro Iwamatsu 
+Closes: #673938
+
+ -- Evgeni Golov   Sun, 27 May 2012 12:53:43 +0200
+
+sdl-ball (1.01-2) unstable; urgency=low
+
+  [ Evgeni Golov ]
+  * Update my email address.
+  * Use dh rules.tiny
+  * format 3.0 (quilt)
+  * Standards-Version: 3.9.3
+  * 

r15988 - packages/trunk/sdl-ball/debian

[Evgeni Golov]

Author: evgeni
Date: 2017-07-23 12:54:57 + (Sun, 23 Jul 2017)
New Revision: 15988

Modified:
   packages/trunk/sdl-ball/debian/changelog
Log:
Upload to unstable.


Modified: packages/trunk/sdl-ball/debian/changelog
===
--- packages/trunk/sdl-ball/debian/changelog2017-07-23 12:49:08 UTC (rev 
15987)
+++ packages/trunk/sdl-ball/debian/changelog2017-07-23 12:54:57 UTC (rev 
15988)
@@ -1,3 +1,11 @@
+sdl-ball (1.02-2) unstable; urgency=medium
+
+  * Upload to unstable.
+  * use https for vsc-browser
+  * Standards-Version: 4.0.0
+
+ -- Evgeni Golov   Sun, 23 Jul 2017 14:35:41 +0200
+
 sdl-ball (1.02-1) experimental; urgency=medium
 
   * New upstream release.


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

r15987 - packages/trunk/sdl-ball/debian

[Evgeni Golov]

Author: evgeni
Date: 2017-07-23 12:49:08 + (Sun, 23 Jul 2017)
New Revision: 15987

Modified:
   packages/trunk/sdl-ball/debian/control
Log:
Standards-Version: 4.0.0


Modified: packages/trunk/sdl-ball/debian/control
===
--- packages/trunk/sdl-ball/debian/control  2017-07-23 12:46:49 UTC (rev 
15986)
+++ packages/trunk/sdl-ball/debian/control  2017-07-23 12:49:08 UTC (rev 
15987)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9), imagemagick,
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
 Homepage: http://sdl-ball.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/sdl-ball/
 Vcs-Browser: 
https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/sdl-ball/


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

r15986 - packages/trunk/sdl-ball/debian

[Evgeni Golov]

Author: evgeni
Date: 2017-07-23 12:46:49 + (Sun, 23 Jul 2017)
New Revision: 15986

Modified:
   packages/trunk/sdl-ball/debian/control
Log:
use https for vsc-browser


Modified: packages/trunk/sdl-ball/debian/control
===
--- packages/trunk/sdl-ball/debian/control  2017-07-19 13:32:50 UTC (rev 
15985)
+++ packages/trunk/sdl-ball/debian/control  2017-07-23 12:46:49 UTC (rev 
15986)
@@ -9,7 +9,7 @@
 Standards-Version: 3.9.6
 Homepage: http://sdl-ball.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/sdl-ball/
-Vcs-Browser: 
http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/sdl-ball/
+Vcs-Browser: 
https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/sdl-ball/
 
 Package: sdl-ball
 Architecture: any


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

[colobot] annotated tag debian/0.1.10-2 created (now 58f1736)

[Didier Raboud]

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

odyx pushed a change to annotated tag debian/0.1.10-2
in repository colobot.

at  58f1736   (tag)
   tagging  324c2289a5ccac8974249cecb1db63f0a21e311f (commit)
  replaces  debian/0.1.10-1
 tagged by  Didier Raboud
on  Sun Jul 23 11:27:51 2017 +0200

- Log -
colobot 0.1.10-2 Debian release
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAll0cmcACgkQi8+nHsoW
NFXSpgv6A9oYD8weBpJ5Zx2DZP9KzcLi4CUejQQRcreZHhp+85koLLSX612WD2pV
iL6pdh11VG4bnX+Jg5yrxUBSwl0aIxb9Rv3+QRmk4s1nISNs/io7F8lEhJZqRjJf
0BRDZavx/fY0koJwxv7iShK4Ss+dnpc+yrwde6VnvkZJkZIiMZvm1BJtmAomz7Av
LsDJdn+KxV5VFO8WCRXWf63/7BEWLxovlHfz1bJvyGT93lxR1cbE0iRGuiIfOONc
ROoZG3chMSA3eOrjoWOCim/x7SuK7hRCyZSaihqFNMp5J+JBmANKhptupor3mmVL
gIyPlQ0dH5ubBRbdlC4KmEs0P/cTlQZ5YnVIciW2dppaCpZzvgHGV2KjZpDtGafz
jTQzQ4BO+uIGQqE1jf4WB32yZjVpbdbEuOfG/xXabuXl0n3fKlTZCSbvdQoEU+pS
J4bLXnoPxCLeauuhWyBCsvadQvQP8l5nFs9D9UHENgQlj4hK6mTmqgOZY2zIARWg
bM1JkeRm
=YSea
-END PGP SIGNATURE-

Didier Raboud (3):
  Bump Standards-Version to 4.0.0 without changes needed
  Migrate to debhelper compat 10
  colobot 0.1.10-2 Debian release

---

This annotated tag includes the following new commits:

   new  7984fed   Bump Standards-Version to 4.0.0 without changes needed
   new  f93370e   Migrate to debhelper compat 10
   new  324c228   colobot 0.1.10-2 Debian release

The 3 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/colobot.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

[colobot] 01/03: Bump Standards-Version to 4.0.0 without changes needed

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit 7984fedb8d28578d118fe131751b12638dcf4d9e
Author: Didier Raboud 
Date:   Sun Jul 23 11:39:09 2017 +0200

Bump Standards-Version to 4.0.0 without changes needed
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 34b77cf..625c3cb 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends-Indep:
  vorbis-tools,
 Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-games/colobot.git -b debian
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/colobot.git
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://colobot.info
 
 Package: colobot

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/colobot.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

[colobot] branch debian/master updated (2d7b4dc -> 324c228)

[Didier Raboud]

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

odyx pushed a change to branch debian/master
in repository colobot.

  from  2d7b4dc   colobot 0.1.10-1 Debian release
   new  7984fed   Bump Standards-Version to 4.0.0 without changes needed
   new  f93370e   Migrate to debhelper compat 10
   new  324c228   colobot 0.1.10-2 Debian release

The 3 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 | 8 
 debian/compat| 2 +-
 debian/control   | 4 ++--
 debian/rules | 4 +---
 4 files changed, 12 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/colobot.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

[colobot] 03/03: colobot 0.1.10-2 Debian release

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit 324c2289a5ccac8974249cecb1db63f0a21e311f
Author: Didier Raboud 
Date:   Sun Jul 23 11:27:51 2017 +0200

colobot 0.1.10-2 Debian release
---
 debian/changelog | 8 
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d804e0f..9980a64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+colobot (0.1.10-2) unstable; urgency=medium
+
+  * Migrate 0.1.10 to unstable
+  * Bump Standards-Version to 4.0.0 without changes needed
+  * Migrate to debhelper compat 10
+
+ -- Didier Raboud   Sun, 23 Jul 2017 11:27:51 +0200
+
 colobot (0.1.10-1) experimental; urgency=low
 
   * New upstream release: 0.1.10

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/colobot.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

[colobot] 02/03: Migrate to debhelper compat 10

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit f93370e1e268ea08733a0e19188734a308acfd6e
Author: Didier Raboud 
Date:   Sun Jul 23 11:44:20 2017 +0200

Migrate to debhelper compat 10
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 debian/rules   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

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 625c3cb..97146dd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Didier Raboud 
 Build-Depends:
  cmake,
- debhelper (>= 9.20151219~),
+ debhelper (>= 10.2.5~),
  google-mock,
  imagemagick,
  libboost-dev,
diff --git a/debian/rules b/debian/rules
index e930aea..bd9d124 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,7 @@ CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=True -DMUSIC_FLAC:BOOL=True
 endif
 
 %:
-   dh $@ \
-   --buildsystem=cmake \
-   --parallel \
+   dh $@
 
 override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/colobot.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

[stendhal-installer] branch master updated (27e2067 -> 477cf01)

[Carlos Donizete Froes]

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

coringao-guest pushed a change to branch master
in repository stendhal-installer.

  from  27e2067   Import Debian changes 0.1-1
   new  3b967cd   Updated tests/control
   new  477cf01   Updated watch

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:
 debian/tests/control | 2 +-
 debian/watch | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/stendhal-installer.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

[stendhal-installer] 02/02: Updated watch

[Carlos Donizete Froes]

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

coringao-guest pushed a commit to branch master
in repository stendhal-installer.

commit 477cf0120b40a09ca6c05947cae88e46a3eec919
Author: Carlos Donizete Froes 
Date:   Sun Jul 23 03:47:17 2017 -0300

Updated watch
---
 debian/watch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/watch b/debian/watch
index 5979a5a..b3e0075 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=4
-opts=pgpsigurlmangle=s/$/.asc/,filenamemangle=s/.+\/(\d\S*)\.tar\.gz/stendhal-installer-$1\.tar\.gz/
 \
-  https://github.com/coringao/stendhal-installer/tags .*/(\d\S*)\.tar\.gz
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/stendhal-installer-$1\.tar\.gz/,\
+pgpsigurlmangle=s/archive\/(\d\S+)\.tar\.gz/releases\/download\/$1\/$1\.tar\.gz\.asc/
 \
+  https://github.com/coringao/stendhal-installer/releases .*/(\d\S+)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/stendhal-installer.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

[stendhal-installer] 01/02: Updated tests/control

[Carlos Donizete Froes]

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

coringao-guest pushed a commit to branch master
in repository stendhal-installer.

commit 3b967cdd1f843419c97d155c507567b028e48ea1
Author: Carlos Donizete Froes 
Date:   Sun Jul 23 03:46:58 2017 -0300

Updated tests/control
---
 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index 226b3c1..35f033b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
-Test-Command: ./stendhal-installer
+Test-Command: bash stendhal-installer
 Depends: default-jre

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/stendhal-installer.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

[minecraft-installer] 02/02: Updated watch

[Carlos Donizete Froes]

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

coringao-guest pushed a commit to branch master
in repository minecraft-installer.

commit e52bffb5190f16010238ea2a5d1d44122384f457
Author: Carlos Donizete Froes 
Date:   Sun Jul 23 03:31:21 2017 -0300

Updated watch
---
 debian/watch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/watch b/debian/watch
index da08f88..92ab4fe 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=4
-opts=pgpsigurlmangle=s/$/.asc/,filenamemangle=s/.+\/(\d\S*)\.tar\.gz/minecraft-installer-$1\.tar\.gz/
 \
-  https://github.com/coringao/minecraft-installer/tags .*/(\d\S*)\.tar\.gz
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/minecraft-installer-$1\.tar\.gz/,\
+pgpsigurlmangle=s/archive\/(\d\S+)\.tar\.gz/releases\/download\/$1\/$1\.tar\.gz\.asc/
 \
+  https://github.com/coringao/minecraft-installer/releases .*/(\d\S+)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minecraft-installer.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

[minecraft-installer] 01/02: Updated tests/control

[Carlos Donizete Froes]

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

coringao-guest pushed a commit to branch master
in repository minecraft-installer.

commit 52999ddfc0fa7f6d374c0133c300ddeaa3780162
Author: Carlos Donizete Froes 
Date:   Sun Jul 23 03:31:01 2017 -0300

Updated tests/control
---
 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index c6467a6..eb5a4eb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
-Test-Command: ./minecraft-installer
+Test-Command: bash minecraft-installer
 Depends: default-jre

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minecraft-installer.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

[minecraft-installer] branch master updated (8a945c6 -> e52bffb)

[Carlos Donizete Froes]

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

coringao-guest pushed a change to branch master
in repository minecraft-installer.

  from  8a945c6   Import Debian changes 0.1-1
   new  52999dd   Updated tests/control
   new  e52bffb   Updated watch

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:
 debian/tests/control | 2 +-
 debian/watch | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minecraft-installer.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