date:20180111

Most Renowned Stages

2018-01-11 Thread Benefis Company

[1]

Our Costumes On The World Most Renowned Stages [2]

WITHIN THE PAST 23 YEARS OF OUR PROFESSIONAL ACTIVITY, OUR COMPANY COLLABORATED 
WITH COUNTLESS PROFESSIONAL BALLET SCHOOLS, THEATERS AS WELL AS WITH WORLD 
RENOWNED BALLET ARTISTS.

GO SHOPPING [3]

New arrivals

View all

[4]

Pas de trois [5]

The costume is carried out as a simple dress of the corresponding epoch.

$378.00

Buy [6]

[7]

Pas de trois [8]

The tunic is carried out of a dense semi-stretch fabric.

$265.00

Buy [9]

[10]

Stage ballet costume [11]

$275.00

Buy [12]

[13]

Giselle Ballet Costume [14]

$205.00

Buy [15]

[16]

Giselle Stage Costume [17]

$250.00

Buy [18]

[facebook] [19] 
 [instagram] [20] 
 [pinterest] [21] 
 [twitter] [22]

Links:
--
[1] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20v
[2] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20v/1
[3] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20v/3
[4] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05NA
[5] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05NA/1
[6] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05NA/2
[7] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05Mg
[8] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05Mg/1
[9] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF82OCZhbXA7cHJvZHVjdF9pZD05Mg/2
[10] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNjU
[11] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNjU/1
[12] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNjU/2
[13] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNTM
[14] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNTM/1
[15] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zNTM/2
[16] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zMjQ
[17] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zMjQ/1
[18] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly9iZW5lZmlzdHV0dS5jb20vaW5kZXgucGhwP3JvdXRlPXByb2R1Y3QvcHJvZHVjdCZhbXA7cGF0aD02MF83MiZhbXA7cHJvZHVjdF9pZD0zMjQ/2
[19] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly93d3cuZmFjZWJvb2suY29tL0JlbmVmaXMtQmFsbGV0LUNvc3R1bWVzLTEyMTc2ODAzNDgzNzcxMS8
[20] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly93d3cuaW5zdGFncmFtLmNvbS90ZXJlbnRpZXZhOTgxNi8
[21] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly93d3cucGludGVyZXN0LmNvbS9iYmFsbGV0Y29zdHVtZXMv
[22] 
http://massmail.benefistutu.com/mailster/324/e327d5326ae08d2d162db6cf77aef1ac/aHR0cHM6Ly90d2l0dGVyLmNvbS9iZW5lZmlzc2hvcA

___
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 (cc11c6e -> 2d4f92f)

2018-01-11 Thread 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  cc11c6e   New upstream version 1.36+u20171216~dfsg
  adds  f3bdd6f   Don't allow qagame module to create "botlib.log" at ANY 
filesystem location
  adds  22fcd82   Make FS_BuildOSPath for botlib.log consistent with 
typical usage
  adds  6387c33   tiny readme thing
  adds  2d4f92f   New upstream version 1.36+u20180108~dfsg

No new revisions were added by this update.

Summary of changes:
 README.md  |  2 +-
 code/botlib/be_interface.c | 21 +
 code/botlib/l_log.c|  5 -
 3 files changed, 6 insertions(+), 22 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] branch pristine-tar updated (49e1d09 -> f1fe26c)

2018-01-11 Thread Simon McVittie

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

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

  from  49e1d09   pristine-tar data for 
ioquake3_1.36+u20171216~dfsg.orig.tar.xz
   new  f1fe26c   pristine-tar data for 
ioquake3_1.36+u20180108~dfsg.orig.tar.xz

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:
 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta | Bin 0 -> 16272 bytes
 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta
 create mode 100644 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id

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

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

[ioquake3] branch debian/master updated (fa76ceb -> 6c061a1)

2018-01-11 Thread 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  fa76ceb   Update Homepage field to use a https URL
  adds  f3bdd6f   Don't allow qagame module to create "botlib.log" at ANY 
filesystem location
  adds  22fcd82   Make FS_BuildOSPath for botlib.log consistent with 
typical usage
  adds  6387c33   tiny readme thing
  adds  2d4f92f   New upstream version 1.36+u20180108~dfsg
  adds  3c130a2   Update upstream source from tag 
'upstream/1.36+u20180108_dfsg'
  adds  d7f6ce4   New upstream snapshot (commit 6387c336)
  adds  1467e0e   Refresh patches
  adds  11ba45e   Compile without Altivec for baseline PowerPC CPUs
  adds  6c061a1   1.36+u20180108~dfsg-1

No new revisions were added by this update.

Summary of changes:
 README.md  |   2 +-
 code/botlib/be_interface.c |  21 +---
 code/botlib/l_log.c|   5 +-
 debian/changelog   |  12 +-
 ...-instructions-on-PowerPC-unless-requested.patch | 130 +
 ...al-vmMagic-that-causes-equivalent-native-.patch |  16 +--
 ...start-which-can-be-set-by-game-code-to-re.patch |  10 +-
 .../debian/Let-servers-set-sv_fps-too.patch|   2 +-
 ...-a-window-by-default-on-new-installations.patch |   8 +-
 debian/patches/series  |   1 +
 debian/rules   |   4 +-
 11 files changed, 166 insertions(+), 45 deletions(-)
 create mode 100644 
debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch

-- 
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] 03/04: AppArmor: Allow reading EGL vendor configuration

2018-01-11 Thread 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 78fc10cd6d47306e76f5f033da403ab2bbb83c8b
Author: Simon McVittie 
Date:   Thu Jan 11 09:50:14 2018 +

AppArmor: Allow reading EGL vendor configuration
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 2 ++
 debian/changelog| 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index b2705f6..adff6ad 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -57,6 +57,8 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
+  # EGL with SDL_VIDEODRIVER=wayland
+  /{etc,usr/share}/glvnd/egl_vendor.d/{,**} r,
 
   profile popup (complain) {
 #include 
diff --git a/debian/changelog b/debian/changelog
index 476ba25..f0e63e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
   * Add reference to #885839 in previous changelog entry
   * Use  from apparmor (>= 2.10.95-5) instead
 of reinventing it
+  * AppArmor: Allow reading EGL vendor configuration
 
  -- Simon McVittie   Thu, 11 Jan 2018 09:48:07 +
 

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

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

[ioquake3] branch debian/master updated (6c061a1 -> 8b02a07)

2018-01-11 Thread 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  6c061a1   1.36+u20180108~dfsg-1
   new  59f1806   Add reference to #885839 in previous changelog entry
   new  3aebbd7   Use  from apparmor (>= 2.10.95-5) 
instead of reinventing it
   new  78fc10c   AppArmor: Allow reading EGL vendor configuration
   new  8b02a07   AppArmor: Allow zenity to read from dconf

The 4 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/apparmor.d/usr.lib.ioquake3.ioquake3 |  9 +
 debian/changelog| 12 +++-
 debian/control  |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

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

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

[ioquake3] 01/04: Add reference to #885839 in previous changelog entry

2018-01-11 Thread 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 59f1806b7d3f5925ce8ed55016297ec66e867e67
Author: Simon McVittie 
Date:   Thu Jan 11 09:48:48 2018 +

Add reference to #885839 in previous changelog entry
---
 debian/changelog | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08ac126..f3a965f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
+ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
+
+  * Add reference to #885839 in previous changelog entry
+
+ -- Simon McVittie   Thu, 11 Jan 2018 09:48:07 +
+
 ioquake3 (1.36+u20180108~dfsg-1) unstable; urgency=medium
 
   [ Pino Toscano ]
-  * Recommend kdialog instead of kdebase-bin
+  * Recommend kdialog instead of kdebase-bin (Closes: #885839)
 
   [ Simon McVittie ]
   * Declare compliance with Debian Policy 4.1.3

-- 
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] 04/04: AppArmor: Allow zenity to read from dconf

2018-01-11 Thread 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 8b02a07d2f2bb54cc7c1adeed60ebacaeee0ed6f
Author: Simon McVittie 
Date:   Thu Jan 11 09:50:36 2018 +

AppArmor: Allow zenity to read from dconf
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 1 +
 debian/changelog| 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index adff6ad..52bbfaa 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -63,6 +63,7 @@
   profile popup (complain) {
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/debian/changelog b/debian/changelog
index f0e63e5..1e87cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
   * Use  from apparmor (>= 2.10.95-5) instead
 of reinventing it
   * AppArmor: Allow reading EGL vendor configuration
+  * AppArmor: Allow zenity to read from dconf
 
  -- Simon McVittie   Thu, 11 Jan 2018 09:48:07 +
 

-- 
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] 02/04: Use from apparmor (>= 2.10.95-5) instead of reinventing it

2018-01-11 Thread 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 3aebbd7cd2280fc564e697ca639b2f92a8ff962b
Author: Simon McVittie 
Date:   Thu Jan 11 09:49:51 2018 +

Use  from apparmor (>= 2.10.95-5) instead of 
reinventing it
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 6 ++
 debian/changelog| 2 ++
 debian/control  | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index 51b611d..b2705f6 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -13,6 +13,7 @@
   #include 
   #include 
   #include 
+  #include 
 
   network inet dgram,
   network inet stream,
@@ -56,14 +57,13 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
-  # Shared memory buffers used in Wayland
-  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
 
   profile popup (complain) {
 #include 
 #include 
 #include 
 #include 
+#include 
 
 /etc/X11/app-defaults/Xmessage-color r,
 /usr/bin/kdialog mr,
@@ -73,8 +73,6 @@
 /usr/share/themes/** r,
 /usr/share/zenity/** r,
 owner @{HOME}/.config/gtk-3.0/settings.ini r,
-
-owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index f3a965f..476ba25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
 
   * Add reference to #885839 in previous changelog entry
+  * Use  from apparmor (>= 2.10.95-5) instead
+of reinventing it
 
  -- Simon McVittie   Thu, 11 Jan 2018 09:48:07 +
 
diff --git a/debian/control b/debian/control
index 3f59625..a5ea91d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Depends:
 Recommends:
  x11-utils | zenity | kdialog,
 Breaks:
+ apparmor (<< 2.10.95-5~),
  openarena (<< 0.8.8-9~),
 Description: Game engine for 3D first person shooter games
  This package installs a modified version of the ioQuake3 game engine,

-- 
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/09: New upstream snapshot (commit 6387c336)

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit d7f6ce48ad7dc1ff4d08e7ade6facc9e1b937601
Author: Simon McVittie 
Date:   Thu Jan 11 08:30:06 2018 +

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

diff --git a/debian/changelog b/debian/changelog
index a695938..0c365ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ioquake3 (1.36+u20171216~dfsg-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Recommend kdialog instead of kdebase-bin
@@ -6,6 +6,7 @@ ioquake3 (1.36+u20171216~dfsg-2) UNRELEASED; urgency=medium
   [ Simon McVittie ]
   * Declare compliance with Debian Policy 4.1.3
   * Update Homepage field to use a https URL
+  * New upstream snapshot (commit 6387c336)
 
  -- Simon McVittie   Sat, 30 Dec 2017 11:36:43 +
 
diff --git a/debian/rules b/debian/rules
index 6e2cc7b..ac458a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,10 +92,10 @@ ORIG_SOURCE = ioquake3
 ORIG_REPO ?= https://github.com/ioquake/ioq3
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = 7166a3cd3934ae743c4259768d44a90c4ab7923a
+ORIG_REV = 6387c336b645a5cffe7b44880609ff4f10c7320a
 # 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 = 20171216
+ORIG_DATE = 20180108
 ORIG_SUFFIX = ~dfsg
 
 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] 03/09: tiny readme thing

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 6387c336b645a5cffe7b44880609ff4f10c7320a
Author: Zachary J. Slater 
Date:   Sun Jan 7 21:41:55 2018 -1000

tiny readme thing
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3dd355c..5e16a3d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The intent of this project is to provide a baseline Quake 3 
which may be used
 for further development and baseq3 fun.
 Some of the major features currently implemented are:
 
-  * SDL backend
+  * SDL 2 backend
   * OpenAL sound API support (multiple speaker support and better sound
 quality)
   * Full x86_64 support on Linux

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

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

[ioquake3] annotated tag debian/1.36+u20180108_dfsg-1 created (now 9c6bc45)

2018-01-11 Thread Simon McVittie

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

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

at  9c6bc45   (tag)
   tagging  6c061a17e2c83c603b255e965c1387fe63f313cf (commit)
  replaces  debian/1.36+u20171216_dfsg-1
 tagged by  Simon McVittie
on  Thu Jan 11 09:33:57 2018 +

- Log -
ioquake3 Debian release 1.36+u20180108~dfsg-1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlpXL4UACgkQ4FrhR4+B
TE8+ug/6A94ZfQGJ1+WEgUJgXYwv3VLeQQpW/crOQW3mZLbpL97a7wsyOZfo1jZ6
kbulaKyUVpvcOnimIrXnaenLv1j6An9ZyL9bqfqqkUwoMDPHHEF4gx3fyNyeDeVr
I9OpnK/mOYciyXj13aETtUl2bYp/0CNS1dzYOcI/6M+95gAVdok7eMFiCIO7UMom
6n/VvSQYVpRDCoovpPQfAmNyqWmw0ugFkJ+7aqZlL8yd9ENyr5qaDOZRUIjvXtYe
BUWRsv8wfcsOLIs/D0vPT5/No0UfhPAENFXDkpqYyjR8FvZ3XtQdD+DBlhBn65HG
+XBXqm7VAN2YjkS1s4VpC/dnJSZar9D++uVpE00Yo/fBJo40ncQWhpY7rCqKJXSn
6Mf+qvTbsMgjaJ6Lb+CRMKZOH8a/YazKcMNWFq92fXr2pYzRTIrrXxbwq2sh352a
fRSmwxk8VS2S07vFEs/+i0qc5/7V0GnDEJGMGp4PquECTcbA5nCEUNt0ujjVP0Md
6BN+ev6ZRz0kr28nk/+GUvychGTNHiBgmo5e37RaYmhKUiqsal28g/x6ZL391Z7i
en71qwf5hv7g3jOfJDnjVZcYCDbGhLqc7v3sF8YojlrnoebyxiJT6rEsVGm/qEoz
A2CnasMTMvB0KFxPBBGu6LvwULecd6KDhZej34Ht81Gs/mrLc64=
=ozUB
-END PGP SIGNATURE-

Eugene C (1):
  Don't allow qagame module to create "botlib.log" at ANY filesystem 
location

Pino Toscano (1):
  Migrate kdebase-bin relationship to kdialog

Simon McVittie (8):
  Declare compliance with Debian Policy 4.1.3
  Update Homepage field to use a https URL
  New upstream version 1.36+u20180108~dfsg
  Update upstream source from tag 'upstream/1.36+u20180108_dfsg'
  New upstream snapshot (commit 6387c336)
  Refresh patches
  Compile without Altivec for baseline PowerPC CPUs
  1.36+u20180108~dfsg-1

Zachary J. Slater (1):
  tiny readme thing

Zack Middleton (1):
  Make FS_BuildOSPath for botlib.log consistent with typical usage

---

This annotated tag includes the following new commits:

   new  f3bdd6f   Don't allow qagame module to create "botlib.log" at ANY 
filesystem location
   new  22fcd82   Make FS_BuildOSPath for botlib.log consistent with 
typical usage
   new  6387c33   tiny readme thing
   new  2d4f92f   New upstream version 1.36+u20180108~dfsg
   new  3c130a2   Update upstream source from tag 
'upstream/1.36+u20180108_dfsg'
   new  d7f6ce4   New upstream snapshot (commit 6387c336)
   new  1467e0e   Refresh patches
   new  11ba45e   Compile without Altivec for baseline PowerPC CPUs
   new  6c061a1   1.36+u20180108~dfsg-1

The 9 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/ioquake3.git

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

[ioquake3] annotated tag upstream/1.36+u20180108_dfsg created (now 42af163)

2018-01-11 Thread Simon McVittie

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

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

at  42af163   (tag)
   tagging  2d4f92f7f2042a8774ad31d5c61886df4c741eee (commit)
  replaces  upstream/1.36+u20171216_dfsg
 tagged by  Simon McVittie
on  Thu Jan 11 08:29:33 2018 +

- Log -
Upstream version 1.36+u20180108~dfsg

Eugene C (1):
  Don't allow qagame module to create "botlib.log" at ANY filesystem 
location

Simon McVittie (1):
  New upstream version 1.36+u20180108~dfsg

Zachary J. Slater (1):
  tiny readme thing

Zack Middleton (1):
  Make FS_BuildOSPath for botlib.log consistent with typical usage

---

No new revisions were added by this update.

-- 
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/09: Refresh patches

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 1467e0e170b47b7d4248222a37469c543b88a1fe
Author: Simon McVittie 
Date:   Thu Jan 11 08:30:38 2018 +

Refresh patches
---
 debian/changelog |  1 +
 ...-special-vmMagic-that-causes-equivalent-native-.patch | 16 
 ...v_dorestart-which-can-be-set-by-game-code-to-re.patch | 10 +-
 debian/patches/debian/Let-servers-set-sv_fps-too.patch   |  2 +-
 ...Run-in-a-window-by-default-on-new-installations.patch |  8 
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c365ef..1cedc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
   * Declare compliance with Debian Policy 4.1.3
   * Update Homepage field to use a https URL
   * New upstream snapshot (commit 6387c336)
+- Refresh patches
 
  -- Simon McVittie   Sat, 30 Dec 2017 11:36:43 +
 
diff --git 
a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
 
b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index cbe5020..607d81e 100644
--- 
a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ 
b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -26,10 +26,10 @@ Forwarded: no
  4 files changed, 64 insertions(+), 5 deletions(-)
 
 diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 92a9e40..107ef13 100644
+index 246b3cd..91561b6 100644
 --- a/code/qcommon/files.c
 +++ b/code/qcommon/files.c
-@@ -1420,7 +1420,7 @@ Return the searchpath in "startSearch".
+@@ -1443,7 +1443,7 @@ Return the searchpath in "startSearch".
  =
  */
  
@@ -38,7 +38,7 @@ index 92a9e40..107ef13 100644
  {
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1444,7 +1444,7 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, i
+@@ -1467,7 +1467,7 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, i
  
while(search)
{
@@ -47,7 +47,7 @@ index 92a9e40..107ef13 100644
{
dir = search->dir;
  
-@@ -1467,7 +1467,7 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, i
+@@ -1490,7 +1490,7 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, i
return VMI_COMPILED;
}
}
@@ -57,7 +57,7 @@ index 92a9e40..107ef13 100644
pack = search->pack;
  
 diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index f8cd035..2487f4a 100644
+index 2880f70..8b9fb93 100644
 --- a/code/qcommon/qcommon.h
 +++ b/code/qcommon/qcommon.h
 @@ -627,7 +627,7 @@ qboolean FS_FileExists( const char *file );
@@ -85,7 +85,7 @@ index 9f2b5fb..3dc8fbb 100644
int vmMagic;
  
 diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
-index e8818a6..f1fc425 100644
+index 03bdb96..d7b2294 100644
 --- a/code/qcommon/vm.c
 +++ b/code/qcommon/vm.c
 @@ -371,6 +371,7 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean 
unpure)
@@ -151,7 +151,7 @@ index e8818a6..f1fc425 100644
if( LittleLong( header.h->vmMagic ) == VM_MAGIC_VER2 ) {
Com_Printf( "...which has vmMagic VM_MAGIC_VER2\n" );
  
-@@ -610,7 +659,7 @@ vm_t *VM_Create( const char *module, intptr_t 
(*systemCalls)(intptr_t *),
+@@ -612,7 +661,7 @@ vm_t *VM_Create( const char *module, intptr_t 
(*systemCalls)(intptr_t *),
  
do
{
@@ -160,7 +160,7 @@ index e8818a6..f1fc425 100644

if(retval == VMI_NATIVE)
{
-@@ -642,6 +691,12 @@ vm_t *VM_Create( const char *module, intptr_t 
(*systemCalls)(intptr_t *),
+@@ -644,6 +693,12 @@ vm_t *VM_Create( const char *module, intptr_t 
(*systemCalls)(intptr_t *),
  
vm->systemCall = systemCalls;
  
diff --git 
a/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
 
b/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index dba3e81..7aab8eb 100644
--- 
a/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+++ 
b/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
@@ -12,10 +12,10 @@ Forwarded: no
  4 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/code/server/server.h b/code/server/server.h
-index 39d6f4d..ed6a2f6 100644
+index ec1620a..4bcb3a0 100644
 --- a/code/server/server.h
 +++ b/code/server/server.h
-@@ -286,6 +286,7 @@ extern cvar_t  *sv_dlRate;
+@@ -288,6 +288,7 @@ extern cvar_t  *sv_dlRate;
  externcvar_t  *sv_minPing;
  extern

[ioquake3] 01/09: Don't allow qagame module to create "botlib.log" at ANY filesystem location

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit f3bdd6f022555fbff4528105c670354893880f90
Author: Eugene C 
Date:   Sun Dec 24 00:41:13 2017 +0200

Don't allow qagame module to create "botlib.log" at ANY filesystem location
---
 code/botlib/be_interface.c | 21 +
 code/botlib/l_log.c|  5 -
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/code/botlib/be_interface.c b/code/botlib/be_interface.c
index 415c1b2..eb0efb9 100644
--- a/code/botlib/be_interface.c
+++ b/code/botlib/be_interface.c
@@ -144,26 +144,7 @@ int Export_BotLibSetup(void)
 
if(botDeveloper)
{
-   char *homedir, *gamedir, *basegame;
-   char logfilename[MAX_OSPATH];
-
-   homedir = LibVarGetString("homedir");
-   gamedir = LibVarGetString("gamedir");
-   basegame = LibVarGetString("basegame");
-
-   if (*homedir)
-   {
-   if(*gamedir)
-   Com_sprintf(logfilename, sizeof(logfilename), 
"%s%c%s%cbotlib.log", homedir, PATH_SEP, gamedir, PATH_SEP);
-   else if(*basegame)
-   Com_sprintf(logfilename, sizeof(logfilename), 
"%s%c%s%cbotlib.log", homedir, PATH_SEP, basegame, PATH_SEP);
-   else
-   Com_sprintf(logfilename, sizeof(logfilename), 
"%s%c" BASEGAME "%cbotlib.log", homedir, PATH_SEP, PATH_SEP);
-   }
-   else
-   Com_sprintf(logfilename, sizeof(logfilename), 
"botlib.log");
-   
-   Log_Open(logfilename);
+   Log_Open("botlib.log");
}
 
botimport.Print(PRT_MESSAGE, "--- BotLib Initialization ---\n");
diff --git a/code/botlib/l_log.c b/code/botlib/l_log.c
index ba51e00..0cfd491 100644
--- a/code/botlib/l_log.c
+++ b/code/botlib/l_log.c
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
 #include 
 
 #include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 #include "botlib.h"
 #include "be_interface.h"  //for botimport.Print
 #include "l_libvar.h"
@@ -58,6 +59,7 @@ static logfile_t logfile;
 //===
 void Log_Open(char *filename)
 {
+   char *ospath;
if (!LibVarValue("log", "0")) return;
if (!filename || !strlen(filename))
{
@@ -69,7 +71,8 @@ void Log_Open(char *filename)
botimport.Print(PRT_ERROR, "log file %s is already opened\n", 
logfile.filename);
return;
} //end if
-   logfile.fp = fopen(filename, "wb");
+   ospath = FS_BuildOSPath(Cvar_VariableString("fs_homepath"), "", 
filename);
+   logfile.fp = fopen(ospath, "wb");
if (!logfile.fp)
{
botimport.Print(PRT_ERROR, "can't open the log file %s\n", 
filename);

-- 
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/09: 1.36+u20180108~dfsg-1

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 6c061a17e2c83c603b255e965c1387fe63f313cf
Author: Simon McVittie 
Date:   Thu Jan 11 08:56:52 2018 +

1.36+u20180108~dfsg-1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9d29eb..08ac126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20180108~dfsg-1) unstable; urgency=medium
 
   [ Pino Toscano ]
   * Recommend kdialog instead of kdebase-bin
@@ -13,7 +13,7 @@ ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
 CPUs. Thanks to GitHub user casey-ac for testing this change.
 This should also work on powerpcspe (Closes: #701561)
 
- -- Simon McVittie   Sat, 30 Dec 2017 11:36:43 +
+ -- Simon McVittie   Thu, 11 Jan 2018 08:56:14 +
 
 ioquake3 (1.36+u20171216~dfsg-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] 08/09: Compile without Altivec for baseline PowerPC CPUs

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 11ba45ec9e354b46bc269e2848d000702c809980
Author: Simon McVittie 
Date:   Thu Jan 11 08:32:40 2018 +

Compile without Altivec for baseline PowerPC CPUs

Thanks to GitHub user casey-ac for testing this change.

Closes: #701561
---
 debian/changelog   |   4 +
 ...-instructions-on-PowerPC-unless-requested.patch | 130 +
 debian/patches/series  |   1 +
 3 files changed, 135 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1cedc64..f9d29eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
   * Update Homepage field to use a https URL
   * New upstream snapshot (commit 6387c336)
 - Refresh patches
+  * d/p/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch:
+Add patch to compile without Altivec to support baseline powerpc
+CPUs. Thanks to GitHub user casey-ac for testing this change.
+This should also work on powerpcspe (Closes: #701561)
 
  -- Simon McVittie   Sat, 30 Dec 2017 11:36:43 +
 
diff --git 
a/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
new file mode 100644
index 000..39b0bef
--- /dev/null
+++ 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
@@ -0,0 +1,130 @@
+From: Simon McVittie 
+Date: Wed, 4 Oct 2017 08:38:36 +0100
+Subject: Disable Altivec instructions on PowerPC unless requested
+
+Baseline PowerPC CPUs are not guaranteed to have Altivec instructions
+available, even if they are 64-bit.
+
+Unlike SSE and similar extensions on x86, there does not seem to be
+a way to enable conditional, targeted use of Altivec based on runtime
+detection (which is what ioquake3 wants to do) without also giving the
+compiler permission to use Altivec in code generation; so to not crash
+on the affected CPUs, we'll have to turn it off altogether.
+
+At one point Altivec was an important optimization, because the
+most commonly available PowerPC CPUs (in Apple G4/G5 hardware)
+had the Altivec instructions, and they were a significant benefit
+there. However, Apple haven't sold PowerPC devices for over 10 years,
+some more recently-manufactured PowerPC CPUs like the (64-bit) Freescale
+e5500 omit Altivec, and CPUs in general are a lot faster now than they
+were when the idTech3 engine was first released, hopefully making the
+optimization unnecessary.
+
+This commit uses -mno-altivec to force Altivec instructions not to be
+emitted, unless Altivec is requested via "make USE_ALTIVEC=1". The Apple
+fork of gcc doesn't document the corresponding -fno-altivec option, so
+we'll have to assume that omitting -faltivec is enough (but non-Altivec
+Macs haven't been sold for a long time anyway).
+
+Bug: https://github.com/ioquake/ioq3/issues/181
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701561
+Tested-by: casey-ac 
+---
+ Makefile  | 41 +++--
+ code/qcommon/q_platform.h |  2 +-
+ 2 files changed, 36 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4aa9f51..45b3720 100644
+--- a/Makefile
 b/Makefile
+@@ -235,6 +235,10 @@ ifndef USE_AUTOUPDATER  # DON'T include unless you mean 
to!
+ USE_AUTOUPDATER=0
+ endif
+ 
++ifndef USE_ALTIVEC
++USE_ALTIVEC=0
++endif
++
+ ifndef DEBUG_CFLAGS
+ DEBUG_CFLAGS=-ggdb -O0
+ endif
+@@ -349,11 +353,19 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" 
"gnu_kfreebsd" "kfreebsd-gnu" "gnu")
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -maltivec
++ifeq ($(USE_ALTIVEC),1)
++  BASE_CFLAGS += -maltivec -DUSE_ALTIVEC
++else
++  BASE_CFLAGS += -mno-altivec
++endif
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-BASE_CFLAGS += -maltivec
++ifeq ($(USE_ALTIVEC),1)
++  BASE_CFLAGS += -maltivec -DUSE_ALTIVEC
++else
++  BASE_CFLAGS += -mno-altivec
++endif
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+@@ -434,10 +446,19 @@ ifeq ($(PLATFORM),darwin)
+  
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)
+ 
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -arch ppc -faltivec
++BASE_CFLAGS += -arch ppc
++ifeq ($(USE_ALTIVEC),1)
++  # -fno-altivec doesn't seem to exist according to
++  # http://www.manpages.info/macosx/gcc.1.html so we'll just have to
++  # hope that the default is no Altivec
++  BASE_CFLAGS += -faltivec -DUSE_ALTIVEC
++endif
+   endif
+   ifeq ($(ARCH),ppc64)
+-BASE_CFLAGS += -arch ppc64 -faltivec
++

[ioquake3] 05/09: Update upstream source from tag 'upstream/1.36+u20180108_dfsg'

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 3c130a29b5b84bc34915bdc9a042a8e9fec71549
Merge: fa76ceb 2d4f92f
Author: Simon McVittie 
Date:   Thu Jan 11 08:29:33 2018 +

Update upstream source from tag 'upstream/1.36+u20180108_dfsg'

Update to upstream version '1.36+u20180108~dfsg'
with Debian dir 754d47e97ea95f1ae2974f5a4337bdd277b88af6

 README.md  |  2 +-
 code/botlib/be_interface.c | 21 +
 code/botlib/l_log.c|  5 -
 3 files changed, 6 insertions(+), 22 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] 01/01: pristine-tar data for ioquake3_1.36+u20180108~dfsg.orig.tar.xz

2018-01-11 Thread 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 f1fe26c56a25ae903b31fae55efc46c758d0a39c
Author: Simon McVittie 
Date:   Thu Jan 11 08:29:33 2018 +

pristine-tar data for ioquake3_1.36+u20180108~dfsg.orig.tar.xz
---
 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta | Bin 0 -> 16272 bytes
 ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta 
b/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta
new file mode 100644
index 000..015d413
Binary files /dev/null and b/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.delta 
differ
diff --git a/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id 
b/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id
new file mode 100644
index 000..acf9746
--- /dev/null
+++ b/ioquake3_1.36+u20180108~dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+94cd25af1f40247b74830cca6b85ef664adcdd3c

-- 
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] 02/09: Make FS_BuildOSPath for botlib.log consistent with typical usage

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 22fcd82965f7a65b511176389149c47391f97cb1
Author: Zack Middleton 
Date:   Sat Dec 23 17:01:06 2017 -0600

Make FS_BuildOSPath for botlib.log consistent with typical usage

I don't think anywhere else uses "" to mean current game directory.
Though it's only an issue for my fork where I removed that behavior.
---
 code/botlib/l_log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/botlib/l_log.c b/code/botlib/l_log.c
index 0cfd491..4d7c4e8 100644
--- a/code/botlib/l_log.c
+++ b/code/botlib/l_log.c
@@ -71,7 +71,7 @@ void Log_Open(char *filename)
botimport.Print(PRT_ERROR, "log file %s is already opened\n", 
logfile.filename);
return;
} //end if
-   ospath = FS_BuildOSPath(Cvar_VariableString("fs_homepath"), "", 
filename);
+   ospath = FS_BuildOSPath(Cvar_VariableString("fs_homepath"), 
Cvar_VariableString("fs_game"), filename);
logfile.fp = fopen(ospath, "wb");
if (!logfile.fp)
{

-- 
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] 04/09: New upstream version 1.36+u20180108~dfsg

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.

commit 2d4f92f7f2042a8774ad31d5c61886df4c741eee
Merge: cc11c6e 6387c33
Author: Simon McVittie 
Date:   Thu Jan 11 08:29:28 2018 +

New upstream version 1.36+u20180108~dfsg

 README.md  |  2 +-
 code/botlib/be_interface.c | 21 +
 code/botlib/l_log.c|  5 -
 3 files changed, 6 insertions(+), 22 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

[openjk] 02/23: [Shared] Add loadhud to MP, make SP reload strings and menus

2018-01-11 Thread Simon McVittie

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

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

commit 7f23591f11dbb144709db9dd1d823587e7f8ff40
Author: Razish 
Date:   Wed Dec 6 23:42:20 2017 +1100

[Shared] Add loadhud to MP, make SP reload strings and menus
---
 code/cgame/cg_consolecmds.cpp | 15 +++
 codemp/cgame/cg_consolecmds.c | 13 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index a990b79..d400ab3 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -27,6 +27,7 @@ along with this program; if not, see 
.
 #include "cg_headers.h"
 
 #include "cg_media.h"  //just for cgs
+#include "ui/ui_shared.h"
 
 void CG_TargetCommand_f( void );
 extern qbooleanplayer_locked;
@@ -196,17 +197,15 @@ void CG_ToggleLAGoggles( void )
}
 }
 
-void CG_LoadHud_f( void )
-{
-   const char *hudSet;
-
-   hudSet = cg_hudFiles.string;
-   if (hudSet[0] == '\0')
-   {
+void CG_LoadHud_f( void ) {
+   const char *hudSet = cg_hudFiles.string;
+   if ( hudSet[0] == '\0' ) {
hudSet = "ui/jahud.txt";
}
 
-   CG_LoadMenus(hudSet);
+   String_Init();
+   Menu_Reset();
+   CG_LoadMenus( hudSet );
 }
 
 typedef struct {
diff --git a/codemp/cgame/cg_consolecmds.c b/codemp/cgame/cg_consolecmds.c
index 2f2c8b2..564da91 100644
--- a/codemp/cgame/cg_consolecmds.c
+++ b/codemp/cgame/cg_consolecmds.c
@@ -27,6 +27,7 @@ along with this program; if not, see 
.
 
 #include "cg_local.h"
 #include "game/bg_saga.h"
+#include "ui/ui_shared.h"
 
 /*
 =
@@ -271,6 +272,17 @@ static void CG_SiegeCompleteCvarUpdate_f(void)
CG_SiegeBriefingDisplay(SIEGETEAM_TEAM2, 1);
 }
 
+static void CG_LoadHud_f( void ) {
+   const char *hudSet = cg_hudFiles.string;
+   if ( hudSet[0] == '\0' ) {
+   hudSet = "ui/jahud.txt";
+   }
+
+   String_Init();
+   Menu_Reset();
+   CG_LoadMenus( hudSet );
+}
+
 typedef struct consoleCommand_s {
const char  *cmd;
void(*func)(void);
@@ -290,6 +302,7 @@ static consoleCommand_t commands[] = {
{ "invnext",CG_NextInventory_f },
{ "invprev",CG_PrevInventory_f },
{ "loaddeferred",   CG_LoadDeferredPlayers 
},
+   { "loadhud",CG_LoadHud_f },
{ "nextframe",  CG_TestModelNextFrame_f 
},
{ "nextskin",   CG_TestModelNextSkin_f 
},
{ "prevframe",  CG_TestModelPrevFrame_f 
},

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

[openjk] 01/23: Revert "Shared: Add DPI awareness manifest"

2018-01-11 Thread Simon McVittie

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

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

commit 1d125c7d15b6e91abe67a3de4e47e27f1406739d
Author: Ensiform 
Date:   Fri Nov 3 20:38:37 2017 -0500

Revert "Shared: Add DPI awareness manifest"

This reverts commit b5c3f14ad9c3f2395617f3477312f3b96729e5be.
---
 code/CMakeLists.txt |  8 
 codemp/CMakeLists.txt   |  8 
 shared/sys/win_manifest.xml | 37 -
 3 files changed, 53 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index db401e7..34525c4 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -416,14 +416,6 @@ if(BuildSPEngine OR BuildJK2SPEngine)
endif()
endif(MakeApplicationBundles)
 
-   # add DPI awareness manifest
-   if(MSVC)
-   add_custom_command(TARGET ${ProjectName} POST_BUILD
-   COMMAND "mt.exe" -manifest 
\"${SharedDir}\\sys\\win_manifest.xml\" 
-inputresource:\"$\"\;\#1 
-outputresource:\"$\"\;\#1
-   COMMENT "Adding manifest..." 
-   )
-   endif()
-
set_target_properties(${ProjectName} PROPERTIES 
COMPILE_DEFINITIONS "${SPEngineDefines}")
 
# Hide symbols not explicitly marked public.
diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
index c2bcbe7..2bd4aa4 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -577,14 +577,6 @@ if(BuildMPEngine)
endif(MakeApplicationBundles)
endif(WIN32)
 
-   # add DPI awareness manifest
-   if(MSVC)
-   add_custom_command(TARGET ${MPEngine} POST_BUILD
-   COMMAND "mt.exe" -manifest 
\"${SharedDir}\\sys\\win_manifest.xml\" 
-inputresource:\"$\"\;\#1 
-outputresource:\"$\"\;\#1
-   COMMENT "Adding manifest..." 
-   )
-   endif()
-
if(MakeApplicationBundles)
install(TARGETS ${MPEngine}
BUNDLE
diff --git a/shared/sys/win_manifest.xml b/shared/sys/win_manifest.xml
deleted file mode 100644
index 2d4412e..000
--- a/shared/sys/win_manifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  http://schemas.microsoft.com/SMI/2005/WindowsSettings;>True/PM
-  http://schemas.microsoft.com/SMI/2016/WindowsSettings;>PerMonitorV2, 
PerMonitor
-
-  
-
\ No newline at end of file

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

[openjk] 08/23: [MP] Added sv_floodProtectSlow (0 = don't reset timer on rejected commands). Allowed sv_floodProtect to specify flood time in ms

2018-01-11 Thread Simon McVittie

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

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

commit 9bbba0a4de24e9f3be1c0c4f1b4144ba6b0487a0
Author: Razish 
Date:   Tue Dec 12 17:03:13 2017 +1100

[MP] Added sv_floodProtectSlow (0 = don't reset timer on rejected 
commands). Allowed sv_floodProtect to specify flood time in ms
---
 codemp/server/server.h  |  3 ++-
 codemp/server/sv_client.cpp | 22 ++
 codemp/server/sv_init.cpp   |  1 +
 codemp/server/sv_main.cpp   |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/codemp/server/server.h b/codemp/server/server.h
index e64b97e..78a2617 100644
--- a/codemp/server/server.h
+++ b/codemp/server/server.h
@@ -168,7 +168,7 @@ typedef struct client_s {
int downloadSendTime;   // time we last 
got an ack from the client
 
int deltaMessage;   // frame last 
client usercmd message
-   int nextReliableTime;   // svs.time 
when another reliable command will be allowed
+   int lastReliableTime;   // svs.time 
when reliable command was last received
int lastPacketTime; // svs.time 
when packet was last received
int lastConnectTime;// svs.time 
when connection started
int nextSnapshotTime;   // send another 
snapshot when svs.time >= nextSnapshotTime
@@ -264,6 +264,7 @@ extern  cvar_t  *sv_maxPing;
 extern cvar_t  *sv_gametype;
 extern cvar_t  *sv_pure;
 extern cvar_t  *sv_floodProtect;
+extern cvar_t  *sv_floodProtectSlow;
 extern cvar_t  *sv_lanForceRate;
 extern cvar_t  *sv_needpass;
 extern cvar_t  *sv_filterCommands;
diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp
index d88ed6e..bb8bf8d 100644
--- a/codemp/server/sv_client.cpp
+++ b/codemp/server/sv_client.cpp
@@ -1336,16 +1336,22 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t 
*msg ) {
// normal to spam a lot of commands when downloading
if ( !com_cl_running->integer &&
cl->state >= CS_ACTIVE &&
-   sv_floodProtect->integer &&
-   svs.time < cl->nextReliableTime ) {
-   // ignore any other text messages from this client but let them 
keep playing
-   // TTimo - moved the ignored verbose to the actual processing 
in SV_ExecuteClientCommand, only printing if the core doesn't intercept
-   clientOk = qfalse;
+   sv_floodProtect->integer )
+   {
+   const int floodTime = (sv_floodProtect->integer == 1) ? 1000 : 
sv_floodProtect->integer;
+   if ( svs.time < (cl->lastReliableTime + floodTime) ) {
+   // ignore any other text messages from this client but 
let them keep playing
+   // TTimo - moved the ignored verbose to the actual 
processing in SV_ExecuteClientCommand, only printing if the core doesn't 
intercept
+   clientOk = qfalse;
+   }
+   else {
+   cl->lastReliableTime = svs.time;
+   }
+   if ( sv_floodProtectSlow->integer ) {
+   cl->lastReliableTime = svs.time;
+   }
}
 
-   // don't allow another command for one second
-   cl->nextReliableTime = svs.time + 1000;
-
SV_ExecuteClientCommand( cl, s, clientOk );
 
cl->lastClientCommand = seq;
diff --git a/codemp/server/sv_init.cpp b/codemp/server/sv_init.cpp
index 0a29a43..11ec030 100644
--- a/codemp/server/sv_init.cpp
+++ b/codemp/server/sv_init.cpp
@@ -963,6 +963,7 @@ void SV_Init (void) {
sv_minPing = Cvar_Get ("sv_minPing", "0", CVAR_ARCHIVE_ND | 
CVAR_SERVERINFO );
sv_maxPing = Cvar_Get ("sv_maxPing", "0", CVAR_ARCHIVE_ND | 
CVAR_SERVERINFO );
sv_floodProtect = Cvar_Get ("sv_floodProtect", "1", CVAR_ARCHIVE | 
CVAR_SERVERINFO, "Protect against flooding of server commands" );
+   sv_floodProtectSlow = Cvar_Get ("sv_floodProtectSlow", "1", 
CVAR_ARCHIVE | CVAR_SERVERINFO, "Use original method of delaying commands with 
flood protection" );
// systeminfo
Cvar_Get ("sv_cheats", "1", CVAR_SYSTEMINFO | CVAR_ROM, "Allow cheats 
on server if set to 1" );
sv_serverid = Cvar_Get ("sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM 
);
diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
index a968c4d..64f593c 100644
--- a/codemp/server/sv_main.cpp
+++ b/codemp/server/sv_main.cpp
@@ -60,6 +60,7 @@ cvar_t*sv_maxPing;
 cvar_t *sv_gametype;
 cvar_t *sv_pure;
 cvar_t *sv_floodProtect;
+cvar_t *sv_floodProtectSlow;
 cvar_t *sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates 
to 9 (bug #491)
 cvar_t *sv_needpass;
 cvar_t *sv_filterCommands; //

[openjk] 09/23: [Shared] Remove unused (conflicting) defines causing compiler warnings (gcc, clang)

2018-01-11 Thread Simon McVittie

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

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

commit 58e5a2002ae8b3d3dbd003d1fb494c0c737c2397
Author: Razish 
Date:   Sun Dec 24 13:32:43 2017 +1100

[Shared] Remove unused (conflicting) defines causing compiler warnings 
(gcc, clang)
---
 code/cgame/cg_local.h| 2 --
 codeJK2/cgame/cg_local.h | 2 --
 codemp/cgame/cg_local.h  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index aea6040..3a1f7e8 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 #defineCHARSMALL_WIDTH 16
diff --git a/codeJK2/cgame/cg_local.h b/codeJK2/cgame/cg_local.h
index 57e6ddb..fa696e1 100644
--- a/codeJK2/cgame/cg_local.h
+++ b/codeJK2/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 #defineCHARSMALL_WIDTH 16
diff --git a/codemp/cgame/cg_local.h b/codemp/cgame/cg_local.h
index 4c7775d..f4be1d3 100644
--- a/codemp/cgame/cg_local.h
+++ b/codemp/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 // very large characters

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

[openjk] 10/23: [MP] Show infostring overflow reason

2018-01-11 Thread Simon McVittie

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

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

commit b5d4273c387cf5c51e4af6dc0a4174bc6dcbe026
Author: Razish 
Date:   Sun Dec 24 15:29:54 2017 +1100

[MP] Show infostring overflow reason
---
 codemp/qcommon/q_shared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codemp/qcommon/q_shared.c b/codemp/qcommon/q_shared.c
index 439ea62..74e3cca 100644
--- a/codemp/qcommon/q_shared.c
+++ b/codemp/qcommon/q_shared.c
@@ -1009,7 +1009,7 @@ void Info_SetValueForKey( char *s, const char *key, const 
char *value ) {
 
if (strlen(newi) + strlen(s) >= MAX_INFO_STRING)
{
-   Com_Printf ("Info string length exceeded\n");
+   Com_Printf ("Info string length exceeded: %s\n", s);
return;
}
 

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

[openjk] 17/23: Update upstream source from tag 'upstream/0_20171228_dfsg'

2018-01-11 Thread Simon McVittie

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

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

commit 0e065d805892b5ed8e0690d9ddf93db7dfe8d192
Merge: d024656 2c2847a
Author: Simon McVittie 
Date:   Mon Jan 1 11:48:03 2018 +

Update upstream source from tag 'upstream/0_20171228_dfsg'

Update to upstream version '0~20171228~dfsg'
with Debian dir 097bc7cb739272e70dc00cefabd8fc68dd0a2854

 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--
 codemp/rd-vanilla/tr_backend.cpp|  22 +-
 codemp/rd-vanilla/tr_bsp.cpp|  50 +--
 codemp/rd-vanilla/tr_cmds.cpp   |  24 +-
 codemp/rd-vanilla/tr_ghoul2.cpp |  24 +-
 codemp/rd-vanilla/tr_image.cpp  |  94 +++---
 codemp/rd-vanilla/tr_init.cpp   | 554 
 codemp/rd-vanilla/tr_light.cpp  |   2 +-
 codemp/rd-vanilla/tr_local.h|   2 -
 codemp/rd-vanilla/tr_main.cpp   |   8 +-
 codemp/rd-vanilla/tr_mesh.cpp   |   6 +-
 codemp/rd-vanilla/tr_model.cpp  |  74 ++---
 codemp/rd-vanilla/tr_scene.cpp  |  14 +-
 codemp/rd-vanilla/tr_shade.cpp  |   4 +-
 codemp/rd-vanilla/tr_shade_calc.cpp |   8 +-
 codemp/rd-vanilla/tr_shader.cpp | 334 +--
 codemp/rd-vanilla/tr_skin.cpp   |  30 +-
 codemp/rd-vanilla/tr_subs.cpp   |  22 +-
 codemp/rd-vanilla/tr_surface.cpp|   2 +-
 codemp/rd-vanilla/tr_surfacesprites.cpp |   2 +-
 codemp/rd-vanilla/tr_terrain.cpp|  28 +-
 codemp/rd-vanilla/tr_world.cpp  |  32 +-
 codemp/server/server.h  |   5 +-
 codemp/server/sv_client.cpp |  42 ++-
 codemp/server/sv_gameapi.cpp|   3 +
 codemp/server/sv_init.cpp   |   9 +-
 codemp/server/sv_main.cpp   |   5 +-
 codemp/ui/ui_force.c|   1 +
 codemp/ui/ui_main.c |  19 +-
 shared/sys/win_manifest.xml |  37 ---
 79 files changed, 1161 insertions(+), 1174 deletions(-)

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

[openjk] 04/23: [MP] Fix multiple master (globalservers 0) support

2018-01-11 Thread Simon McVittie

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

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

commit 4090e096070547f48828e8fb2ced74b05e1563f6
Author: Ensiform 
Date:   Thu Dec 7 10:08:21 2017 +1100

[MP] Fix multiple master (globalservers 0) support
---
 codemp/client/cl_main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codemp/client/cl_main.cpp b/codemp/client/cl_main.cpp
index 7d60b23..e540fd2 100644
--- a/codemp/client/cl_main.cpp
+++ b/codemp/client/cl_main.cpp
@@ -3339,12 +3339,12 @@ void CL_GlobalServers_f( void ) {
return;
}
 
-   Com_sprintf( command, sizeof(command), "sv_master%d", masterNum + 1 );
+   Com_sprintf( command, sizeof(command), "sv_master%d", masterNum );
masteraddress = Cvar_VariableString( command );
 
if ( !*masteraddress )
{
-   Com_Printf( "CL_GlobalServers_f: Error: No master server 
address given.\n" );
+   Com_Printf( "CL_GlobalServers_f: Error: No master server 
address given for %s.\n", command );
return;
}
 

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

[openjk] 03/23: [MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, also force roll angle Default sv_filterCommands to 1, move '; ' filtering to value 2

2018-01-11 Thread Simon McVittie

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

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

commit 8b07e58c1c2875e94823c8afe5443e003370349b
Author: Razish 
Date:   Wed Dec 6 23:49:59 2017 +1100

[MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, also force roll angle
Default sv_filterCommands to 1, move ';' filtering to value 2
---
 codemp/server/server.h  |  2 +-
 codemp/server/sv_client.cpp | 20 +++-
 codemp/server/sv_init.cpp   |  8 
 codemp/server/sv_main.cpp   |  4 ++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/codemp/server/server.h b/codemp/server/server.h
index 9f4839a..e64b97e 100644
--- a/codemp/server/server.h
+++ b/codemp/server/server.h
@@ -270,7 +270,7 @@ extern  cvar_t  *sv_filterCommands;
 extern cvar_t  *sv_autoDemo;
 extern cvar_t  *sv_autoDemoBots;
 extern cvar_t  *sv_autoDemoMaxMaps;
-extern cvar_t  *sv_legacyFixForceSelect;
+extern cvar_t  *sv_legacyFixes;
 extern cvar_t  *sv_banFile;
 
 extern serverBan_t serverBans[SERVER_MAXBANS];
diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp
index f6f9635..d88ed6e 100644
--- a/codemp/server/sv_client.cpp
+++ b/codemp/server/sv_client.cpp
@@ -1285,8 +1285,13 @@ void SV_ExecuteClientCommand( client_t *cl, const char 
*s, qboolean clientOK ) {
// pass unknown strings to the game
if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE 
|| cl->state == CS_PRIMED)) {
// strip \r \n and ;
-   if ( sv_filterCommands->integer )
-   Cmd_Args_Sanitize();
+   if ( sv_filterCommands->integer ) {
+   Cmd_Args_Sanitize( MAX_CVAR_VALUE_STRING, 
"\n\r", "  " );
+   if ( sv_filterCommands->integer == 2 ) {
+   // also strip ';' for callvote
+   Cmd_Args_Sanitize( 
MAX_CVAR_VALUE_STRING, ";", " " );
+   }
+   }
GVM_ClientCommand( cl - svs.clients );
}
}
@@ -1419,9 +1424,14 @@ static void SV_UserMove( client_t *cl, msg_t *msg, 
qboolean delta ) {
for ( i = 0 ; i < cmdCount ; i++ ) {
cmd = [i];
MSG_ReadDeltaUsercmdKey( msg, key, oldcmd, cmd );
-   if ( sv_legacyFixForceSelect->integer && (cmd->forcesel == 
FP_LEVITATION || cmd->forcesel >= NUM_FORCE_POWERS) )
-   {
-   cmd->forcesel = 0xFFu;
+   if ( sv_legacyFixes->integer ) {
+   // block "charge jump" and other nonsense
+   if ( cmd->forcesel == FP_LEVITATION || cmd->forcesel >= 
NUM_FORCE_POWERS ) {
+   cmd->forcesel = 0xFFu;
+   }
+
+   // affects speed calculation
+   cmd->angles[ROLL] = 0;
}
oldcmd = cmd;
}
diff --git a/codemp/server/sv_init.cpp b/codemp/server/sv_init.cpp
index 1ad1fbf..0a29a43 100644
--- a/codemp/server/sv_init.cpp
+++ b/codemp/server/sv_init.cpp
@@ -951,8 +951,8 @@ void SV_Init (void) {
Cvar_CheckRange( sv_privateClients, 0, MAX_CLIENTS, qtrue );
sv_hostname = Cvar_Get ("sv_hostname", "*Jedi*", CVAR_SERVERINFO | 
CVAR_ARCHIVE, "The name of the server that is displayed in the serverlist" );
sv_maxclients = Cvar_Get ("sv_maxclients", "8", CVAR_SERVERINFO | 
CVAR_LATCH, "Max. connected clients" );
-   
-   
+
+
//cvar_t*sv_ratePolicy; // 1-2
//cvar_t*sv_clientRate;
sv_ratePolicy = Cvar_Get( "sv_ratePolicy", "1", CVAR_ARCHIVE_ND, 
"Determines which policy of enforcement is used for client's \"rate\" cvar" );
@@ -997,7 +997,7 @@ void SV_Init (void) {
sv_mapChecksum = Cvar_Get ("sv_mapChecksum", "", CVAR_ROM);
sv_lanForceRate = Cvar_Get ("sv_lanForceRate", "1", CVAR_ARCHIVE_ND );
 
-   sv_filterCommands = Cvar_Get( "sv_filterCommands", "0", CVAR_ARCHIVE );
+   sv_filterCommands = Cvar_Get( "sv_filterCommands", "1", CVAR_ARCHIVE );
 
 // sv_debugserver = Cvar_Get ("sv_debugserver", "0", 0);
 
@@ -1005,7 +1005,7 @@ void SV_Init (void) {
sv_autoDemoBots = Cvar_Get( "sv_autoDemoBots", "0", CVAR_ARCHIVE_ND, 
"Record server-side demos for bots" );
sv_autoDemoMaxMaps = Cvar_Get( "sv_autoDemoMaxMaps", "0", 
CVAR_ARCHIVE_ND );
 
-   sv_legacyFixForceSelect = Cvar_Get( "sv_legacyFixForceSelect", "1", 
CVAR_ARCHIVE );
+   sv_legacyFixes = Cvar_Get( "sv_legacyFixes", "1", CVAR_ARCHIVE );
 
sv_banFile = Cvar_Get( "sv_banFile", "serverbans.dat", CVAR_ARCHIVE, 
"File to use to store bans and exceptions" );
 
diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
index 6c61869..a968c4d 100644
---

[openjk] 12/23: [MP] Mindtrick users now decloak when they attempt to melee grapple someone

2018-01-11 Thread Simon McVittie

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

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

commit 5dedb33968797ebdb113c4c35b3039b734a7f7a2
Author: Razish 
Date:   Mon Dec 25 10:37:27 2017 +1100

[MP] Mindtrick users now decloak when they attempt to melee grapple someone
---
 codemp/game/g_cmds.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codemp/game/g_cmds.c b/codemp/game/g_cmds.c
index 9f2be21..c2a9feb 100644
--- a/codemp/game/g_cmds.c
+++ b/codemp/game/g_cmds.c
@@ -3258,6 +3258,7 @@ qboolean TryGrapple(gentity_t *ent)
ent->client->ps.legsTimer = ent->client->ps.torsoTimer;
}
ent->client->ps.weaponTime = ent->client->ps.torsoTimer;
+   ent->client->dangerTime = level.time;
return qtrue;
}
 

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

[openjk] 07/23: [Shared] Fix crash when passing invalid animations to PM_AnimLength. Fixes #943. Ref #939. Thanks to @peter-kien for pointing out the cause of UB

2018-01-11 Thread Simon McVittie

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

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

commit 92059a6bdd9a7a256e0a07d550c5fc4db4ddb8f4
Author: Razish 
Date:   Sun Dec 10 02:42:29 2017 +1100

[Shared] Fix crash when passing invalid animations to PM_AnimLength. Fixes 
#943. Ref #939.
Thanks to @peter-kien for pointing out the cause of UB
---
 code/game/bg_panimate.cpp|  8 
 codeJK2/game/bg_panimate.cpp |  6 +++---
 codemp/game/bg_panimate.c| 20 
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/code/game/bg_panimate.cpp b/code/game/bg_panimate.cpp
index b681329..a016cc6 100644
--- a/code/game/bg_panimate.cpp
+++ b/code/game/bg_panimate.cpp
@@ -4373,12 +4373,12 @@ PM_AnimLength
 -
 */
 
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if ( ValidAnimFileIndex( index ) == false )
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !ValidAnimFileIndex( index ) || (int)anim < 0 || anim >= 
MAX_ANIMATIONS ) {
return 0;
+   }
 
-   return level.knownAnimFileSets[index].animations[anim].numFrames * 
abs(level.knownAnimFileSets[index].animations[anim].frameLerp);
+   return level.knownAnimFileSets[index].animations[anim].numFrames * abs( 
level.knownAnimFileSets[index].animations[anim].frameLerp );
 }
 
 /*
diff --git a/codeJK2/game/bg_panimate.cpp b/codeJK2/game/bg_panimate.cpp
index 7fd2c7c..91ecc83 100644
--- a/codeJK2/game/bg_panimate.cpp
+++ b/codeJK2/game/bg_panimate.cpp
@@ -2035,10 +2035,10 @@ PM_AnimLength
 -
 */
 
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if ( ValidAnimFileIndex( index ) == false )
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !ValidAnimFileIndex( index ) || (int)anim < 0 || anim >= 
MAX_ANIMATIONS ) {
return 0;
+   }
 
return level.knownAnimFileSets[index].animations[anim].numFrames * 
fabs((double)(level.knownAnimFileSets[index].animations[anim].frameLerp));
 }
diff --git a/codemp/game/bg_panimate.c b/codemp/game/bg_panimate.c
index 8b7b22f..3f6b9be 100644
--- a/codemp/game/bg_panimate.c
+++ b/codemp/game/bg_panimate.c
@@ -1589,25 +1589,21 @@ and anim number. Obviously does not take things like 
the length of the
 anim while force speeding (as an example) and whatnot into account.
 =
 */
-int BG_AnimLength( int index, animNumber_t anim )
-{
-   if (anim >= MAX_ANIMATIONS)
-   {
-   return -1;
+int BG_AnimLength( int index, animNumber_t anim ) {
+   if ( (int)anim < 0 || anim >= MAX_ANIMATIONS ) {
+   return 0;
}
 
-   return bgAllAnims[index].anims[anim].numFrames * 
fabs((float)(bgAllAnims[index].anims[anim].frameLerp));
+   return bgAllAnims[index].anims[anim].numFrames * fabs( 
(float)(bgAllAnims[index].anims[anim].frameLerp) );
 }
 
 //just use whatever pm->animations is
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if (anim >= MAX_ANIMATIONS || !pm->animations)
-   {
-   return -1;
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !pm->animations || (int)anim < 0 || anim >= MAX_ANIMATIONS ) {
+   return 0;
}
 
-   return pm->animations[anim].numFrames * 
fabs((float)(pm->animations[anim].frameLerp));
+   return pm->animations[anim].numFrames * fabs( 
(float)(pm->animations[anim].frameLerp) );
 }
 
 void PM_DebugLegsAnim(int anim)

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

[openjk] 15/23: Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"

2018-01-11 Thread Simon McVittie

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

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

commit 01dd4909e87ec524f0eef64f0f1fc1ceb750516a
Author: Ken <21211439+ke...@users.noreply.github.com>
Date:   Sat Dec 16 00:23:07 2017 -0800

Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"

This allows the test to match to both Clang and AppleClang, which fixes the 
build on MacOS systems that use the built in Apple clang compiler.
---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3e4798..3fc405b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ if(MSVC)
# We don't try to control symbol visibility under MSVC.
set(OPENJK_VISIBILITY_FLAGS "")
 
-elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" 
STREQUAL "Clang"))
+elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" 
MATCHES "Clang"))
# I hope this doesn't come back to bite me in the butt later on.
# Realistically though, can the C and CXX compilers be different?
 
@@ -260,7 +260,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR 
("${CMAKE_C_COMPILER_ID}" S
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-static-libstdc++")
endif()
-   elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+   elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment")
endif()
@@ -275,7 +275,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR 
("${CMAKE_C_COMPILER_ID}" S
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
endif()
-   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-Wno-deprecated-writable-strings")

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

[openjk] 16/23: New upstream version 0~20171228~dfsg

2018-01-11 Thread Simon McVittie

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

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

commit 2c2847abdbb910ab18ba00c56f346fd8741d6429
Merge: 6543521 01dd490
Author: Simon McVittie 
Date:   Mon Jan 1 11:47:43 2018 +

New upstream version 0~20171228~dfsg

 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--
 codemp/rd-vanilla/tr_backend.cpp|  22 +-
 codemp/rd-vanilla/tr_bsp.cpp|  50 +--
 codemp/rd-vanilla/tr_cmds.cpp   |  24 +-
 codemp/rd-vanilla/tr_ghoul2.cpp |  24 +-
 codemp/rd-vanilla/tr_image.cpp  |  94 +++---
 codemp/rd-vanilla/tr_init.cpp   | 554 
 codemp/rd-vanilla/tr_light.cpp  |   2 +-
 codemp/rd-vanilla/tr_local.h|   2 -
 codemp/rd-vanilla/tr_main.cpp   |   8 +-
 codemp/rd-vanilla/tr_mesh.cpp   |   6 +-
 codemp/rd-vanilla/tr_model.cpp  |  74 ++---
 codemp/rd-vanilla/tr_scene.cpp  |  14 +-
 codemp/rd-vanilla/tr_shade.cpp  |   4 +-
 codemp/rd-vanilla/tr_shade_calc.cpp |   8 +-
 codemp/rd-vanilla/tr_shader.cpp | 334 +--
 codemp/rd-vanilla/tr_skin.cpp   |  30 +-
 codemp/rd-vanilla/tr_subs.cpp   |  22 +-
 codemp/rd-vanilla/tr_surface.cpp|   2 +-
 codemp/rd-vanilla/tr_surfacesprites.cpp |   2 +-
 codemp/rd-vanilla/tr_terrain.cpp|  28 +-
 codemp/rd-vanilla/tr_world.cpp  |  32 +-
 codemp/server/server.h  |   5 +-
 codemp/server/sv_client.cpp |  42 ++-
 codemp/server/sv_gameapi.cpp|   3 +
 codemp/server/sv_init.cpp   |   9 +-
 codemp/server/sv_main.cpp   |   5 +-
 codemp/ui/ui_force.c|   1 +
 codemp/ui/ui_main.c |  19 +-
 shared/sys/win_manifest.xml |  37 ---
 79 files changed, 1161 insertions(+), 1174 deletions(-)

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

[openjk] 20/23: Move to debhelper compat level 11

2018-01-11 Thread Simon McVittie

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

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

commit 56631c2fc6d9fffcba5488ea38faa28226488b1a
Author: Simon McVittie 
Date:   Mon Jan 1 12:16:22 2018 +

Move to debhelper compat level 11
---
 debian/changelog | 1 +
 debian/compat| 2 +-
 debian/control   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82edc7f..558f639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
   * Standards-Version: 4.1.3 (no changes required)
+  * Move to debhelper compat level 11
 
  -- Simon McVittie   Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index dc82bde..1adc009 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team 

 Uploaders: Simon McVittie 
 Build-Depends:
  cmake,
- debhelper (>= 10),
+ debhelper (>= 11~),
  dh-apparmor [linux-any],
  dh-exec,
  dpkg-dev (>= 1.16.1),

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

[openjk] 18/23: New upstream snapshot 01dd4909

2018-01-11 Thread Simon McVittie

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

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

commit 2163872ac87197e8febe36b27833613fde93b9ef
Author: Simon McVittie 
Date:   Mon Jan 1 11:49:17 2018 +

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

diff --git a/debian/changelog b/debian/changelog
index 8863a92..e979f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-openjk (0~20171104~dfsg-2) UNRELEASED; urgency=medium
+openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
   * Standards-Version: 4.1.2 (no changes required)
diff --git a/debian/rules b/debian/rules
index db57fc3..02d7ce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,10 +161,10 @@ ORIG_SOURCE = openjk
 ORIG_REPO ?= https://github.com/JACoders/OpenJK
 ORIG_REL =
 # Empty if it's a release
-ORIG_REV = d60340bb827318e9717607f82773cb74f9181a3d
+ORIG_REV = 01dd4909e87ec524f0eef64f0f1fc1ceb750516a
 # 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 = 20171104
+ORIG_DATE = 20171228
 ORIG_SUFFIX = ~dfsg
 
 ifeq (${ORIG_REV},)

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

[openjk] 05/23: SP: Fix symbol error caused by UI functions in cgame

2018-01-11 Thread Simon McVittie

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

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

commit eba428e64e314ddb822d52f3bf10c12c8f631cfe
Author: Ensiform 
Date:   Fri Dec 8 09:42:55 2017 -0600

SP: Fix symbol error caused by UI functions in cgame

These two functions existin SP's exe which is where UI resides there.

I am leaving references to the proper syscalls but since they do not get 
used when hud is normally loaded in SP (commented out), I think it is best to 
not call them as it is a global state affecting menus as well.
---
 code/cgame/cg_consolecmds.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index d400ab3..eb4b79a 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -27,7 +27,6 @@ along with this program; if not, see 
.
 #include "cg_headers.h"
 
 #include "cg_media.h"  //just for cgs
-#include "ui/ui_shared.h"
 
 void CG_TargetCommand_f( void );
 extern qbooleanplayer_locked;
@@ -203,8 +202,8 @@ void CG_LoadHud_f( void ) {
hudSet = "ui/jahud.txt";
}
 
-   String_Init();
-   Menu_Reset();
+   //cgi_UI_String_Init();
+   //cgi_UI_Menu_Reset();
CG_LoadMenus( hudSet );
 }
 

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

[openjk] branch debian/master updated (d024656 -> 14de557)

2018-01-11 Thread Simon McVittie

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

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

  from  d024656   Standards-Version: 4.1.2 (no changes required)
   new  1d125c7   Revert "Shared: Add DPI awareness manifest"
   new  7f23591   [Shared] Add loadhud to MP, make SP reload strings and 
menus
   new  8b07e58   [MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, 
also force roll angle Default sv_filterCommands to 1, move ';' filtering to 
value 2
   new  4090e09   [MP] Fix multiple master (globalservers 0) support
   new  eba428e   SP: Fix symbol error caused by UI functions in cgame
   new  ae3900f   Change refimport ri from ptr type to value type
   new  92059a6   [Shared] Fix crash when passing invalid animations to 
PM_AnimLength. Fixes #943. Ref #939. Thanks to @peter-kien for pointing out the 
cause of UB
   new  9bbba0a   [MP] Added sv_floodProtectSlow (0 = don't reset timer on 
rejected commands). Allowed sv_floodProtect to specify flood time in ms
   new  58e5a20   [Shared] Remove unused (conflicting) defines causing 
compiler warnings (gcc, clang)
   new  b5d4273   [MP] Show infostring overflow reason
   new  18f2049   [MP] Fix for holocron mode to disallow saber styles that 
aren't known
   new  5dedb33   [MP] Mindtrick users now decloak when they attempt to 
melee grapple someone
   new  41bd4d8   [MP] Fix ghoul2 crash found by changing from FFA->Siege 
and restarting map on local server
   new  efbeb7c   [MP] Properly close file handles in the case of errors. 
Also fixed some flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)
   new  01dd490   Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"
   new  2c2847a   New upstream version 0~20171228~dfsg
   new  0e065d8   Update upstream source from tag 'upstream/0_20171228_dfsg'
   new  2163872   New upstream snapshot 01dd4909
   new  af933f7   Standards-Version: 4.1.3 (no changes required)
   new  56631c2   Move to debhelper compat level 11
   new  ba01e3a   Move packaging to salsa.debian.org
   new  174f4d2   0~20171228~dfsg-1
   new  14de557   Change Vcs-* from debiangames-team to games-team

The 23 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:
 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--

[openjk] 23/23: Change Vcs-* from debiangames-team to games-team

2018-01-11 Thread Simon McVittie

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

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

commit 14de5571f290cd2df5d1ae62a752201466494ac5
Author: Simon McVittie 
Date:   Thu Jan 11 17:27:37 2018 +

Change Vcs-* from debiangames-team to games-team
---
 debian/changelog | 6 ++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b1e743..a07868c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjk (0~20171228~dfsg-2) UNRELEASED; urgency=medium
+
+  * Change Vcs-* from debiangames-team to games-team
+
+ -- Simon McVittie   Thu, 11 Jan 2018 17:26:55 +
+
 openjk (0~20171228~dfsg-1) experimental; urgency=medium
 
   * New upstream snapshot 01dd4909
diff --git a/debian/control b/debian/control
index 5967245..1fc5bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
  zip,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://salsa.debian.org/debiangames-team/openjk.git
-Vcs-Browser: https://salsa.debian.org/debiangames-team/openjk
+Vcs-Git: https://salsa.debian.org/games-team/openjk.git
+Vcs-Browser: https://salsa.debian.org/games-team/openjk
 Homepage: https://github.com/JACoders/OpenJK
 
 Package: openjk-academy

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

[openjk] 14/23: [MP] Properly close file handles in the case of errors. Also fixed some flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)

2018-01-11 Thread Simon McVittie

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

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

commit efbeb7cbbee591620932d053bb4a4f0131846538
Author: Razish 
Date:   Mon Dec 25 10:41:08 2017 +1100

[MP] Properly close file handles in the case of errors. Also fixed some 
flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)
---
 codemp/cgame/cg_event.c  |  2 +-
 codemp/cgame/cg_players.c|  1 +
 codemp/cgame/cg_saga.c   |  7 +--
 codemp/game/NPC_stats.c  |  1 +
 codemp/game/ai_util.c|  1 +
 codemp/game/ai_wpnav.c   |  7 ---
 codemp/game/bg_misc.c| 28 ++--
 codemp/game/bg_panimate.c|  1 +
 codemp/game/bg_saberLoad.c   |  3 ++-
 codemp/game/bg_saga.c| 14 ++
 codemp/game/bg_vehicleLoad.c |  2 ++
 codemp/game/g_saga.c |  7 +--
 codemp/game/g_utils.c| 11 ---
 codemp/ui/ui_force.c |  1 +
 codemp/ui/ui_main.c  | 19 +++
 15 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/codemp/cgame/cg_event.c b/codemp/cgame/cg_event.c
index bd10465..98d3992 100644
--- a/codemp/cgame/cg_event.c
+++ b/codemp/cgame/cg_event.c
@@ -3121,7 +3121,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
DEBUGNAME("EV_MUTE_SOUND");
if (cg_entities[es->trickedentindex2].currentState.eFlags & 
EF_SOUNDTRACKER)
{
-   cg_entities[es->trickedentindex2].currentState.eFlags 
-= EF_SOUNDTRACKER;
+   cg_entities[es->trickedentindex2].currentState.eFlags 
&= ~EF_SOUNDTRACKER;
}
trap->S_MuteSound(es->trickedentindex2, es->trickedentindex);
CG_S_StopLoopingSound(es->trickedentindex2, -1);
diff --git a/codemp/cgame/cg_players.c b/codemp/cgame/cg_players.c
index 1289716..6eac153 100644
--- a/codemp/cgame/cg_players.c
+++ b/codemp/cgame/cg_players.c
@@ -366,6 +366,7 @@ qboolean CG_ParseSurfsFile( const char *modelName, const 
char *skinName, char *s
if ( len >= sizeof( text ) - 1 )
{
Com_Printf( "File %s too long\n", sfilename );
+   trap->FS_Close( f );
return qfalse;
}
 
diff --git a/codemp/cgame/cg_saga.c b/codemp/cgame/cg_saga.c
index 7f3ebde..9d688fb 100644
--- a/codemp/cgame/cg_saga.c
+++ b/codemp/cgame/cg_saga.c
@@ -188,8 +188,11 @@ void CG_InitSiegeMode(void)
 
len = trap->FS_Open(levelname, , FS_READ);
 
-   if (!f || len >= MAX_SIEGE_INFO_SIZE)
-   {
+   if ( !f ) {
+   goto failure;
+   }
+   if ( len >= MAX_SIEGE_INFO_SIZE ) {
+   trap->FS_Close( f );
goto failure;
}
 
diff --git a/codemp/game/NPC_stats.c b/codemp/game/NPC_stats.c
index 0478405..4920ad8 100644
--- a/codemp/game/NPC_stats.c
+++ b/codemp/game/NPC_stats.c
@@ -3591,6 +3591,7 @@ void NPC_LoadParms( void )
else
{
if ( totallen + len >= MAX_NPC_DATA_SIZE ) {
+   trap->FS_Close( f );
trap->Error( ERR_DROP, "NPC extensions (*.npc) 
are too large" );
}
trap->FS_Read(npcParseBuffer, len, f);
diff --git a/codemp/game/ai_util.c b/codemp/game/ai_util.c
index 44bd157..03dc9bb 100644
--- a/codemp/game/ai_util.c
+++ b/codemp/game/ai_util.c
@@ -656,6 +656,7 @@ void BotUtilizePersonality(bot_state_t *bs)
{
trap->Print(S_COLOR_RED "Personality file exceeds maximum 
length\n");
B_TempFree(131072); //buf
+   trap->FS_Close( f );
return;
}
 
diff --git a/codemp/game/ai_wpnav.c b/codemp/game/ai_wpnav.c
index 992060f..562fe75 100644
--- a/codemp/game/ai_wpnav.c
+++ b/codemp/game/ai_wpnav.c
@@ -1886,7 +1886,7 @@ void CalculateWeightGoals(void)
 
if (gWPArray[i]->flags & WPFLAG_GOALPOINT)
{
-   gWPArray[i]->flags -= WPFLAG_GOALPOINT;
+   gWPArray[i]->flags &= ~WPFLAG_GOALPOINT;
}
}
 
@@ -2047,6 +2047,7 @@ int LoadPathData(const char *filename)
if (len >= 524288)
{
trap->Print(S_COLOR_RED "Route file exceeds maximum length\n");
+   trap->FS_Close( f );
return 0;
}
 
@@ -3709,11 +3710,11 @@ int AcceptBotCommand(char *cmd, gentity_t *pl)
{
if (gWPArray[i]->flags & WPFLAG_ONEWAY_FWD)
{
-   gWPArray[i]->flags -= WPFLAG_ONEWAY_FWD;
+   gWPArray[i]->flags &= 
~WPFLAG_ONEWAY_FWD;
}
if

[openjk] 13/23: [MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map on local server

2018-01-11 Thread Simon McVittie

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

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

commit 41bd4d8f5eabf0a24ffdb8cc3d9071d857cda532
Author: Razish 
Date:   Mon Dec 25 10:38:21 2017 +1100

[MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map 
on local server
---
 codemp/server/sv_gameapi.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/codemp/server/sv_gameapi.cpp b/codemp/server/sv_gameapi.cpp
index 8879f7b..ea7135c 100644
--- a/codemp/server/sv_gameapi.cpp
+++ b/codemp/server/sv_gameapi.cpp
@@ -1542,6 +1542,9 @@ static int SV_G2API_CopyGhoul2Instance( void *g2From, 
void *g2To, int modelIndex
 }
 
 static void SV_G2API_CopySpecificGhoul2Model( void *g2From, int modelFrom, 
void *g2To, int modelTo ) {
+   if ( !g2From || !g2To ) {
+   return;
+   }
re->G2API_CopySpecificG2Model( *((CGhoul2Info_v *)g2From), modelFrom, 
*((CGhoul2Info_v *)g2To), modelTo );
 }
 

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

[openjk] 19/23: Standards-Version: 4.1.3 (no changes required)

2018-01-11 Thread Simon McVittie

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

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

commit af933f7a2f99a11541f3c7f618d7d5dd8295138d
Author: Simon McVittie 
Date:   Mon Jan 1 12:15:12 2018 +

Standards-Version: 4.1.3 (no changes required)
---
 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e979f3e..82edc7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
-  * Standards-Version: 4.1.2 (no changes required)
+  * Standards-Version: 4.1.3 (no changes required)
 
  -- Simon McVittie   Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/control b/debian/control
index f8d56e1..dc82bde 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libsdl2-dev (>= 2.0.7~),
  zip,
 Rules-Requires-Root: no
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/openjk.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openjk.git
 Homepage: https://github.com/JACoders/OpenJK

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

[openjk] 22/23: 0~20171228~dfsg-1

2018-01-11 Thread Simon McVittie

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

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

commit 174f4d28e8f023513e6d448cf698edd0cff1aa70
Author: Simon McVittie 
Date:   Mon Jan 1 12:28:33 2018 +

0~20171228~dfsg-1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fba4094..5b1e743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
+openjk (0~20171228~dfsg-1) experimental; urgency=medium
 
   * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
@@ -7,7 +7,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * Move to debhelper compat level 11
   * Move packaging to salsa.debian.org
 
- -- Simon McVittie   Mon, 27 Nov 2017 11:01:17 +
+ -- Simon McVittie   Mon, 01 Jan 2018 12:28:22 +
 
 openjk (0~20171104~dfsg-1) experimental; urgency=medium
 

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

[openjk] 21/23: Move packaging to salsa.debian.org

2018-01-11 Thread Simon McVittie

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

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

commit ba01e3aa066019ffb5e781145048b9ec8129
Author: Simon McVittie 
Date:   Mon Jan 1 12:28:21 2018 +

Move packaging to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 558f639..fba4094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
 by upstream
   * Standards-Version: 4.1.3 (no changes required)
   * Move to debhelper compat level 11
+  * Move packaging to salsa.debian.org
 
  -- Simon McVittie   Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/control b/debian/control
index 1adc009..5967245 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
  zip,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/openjk.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openjk.git
+Vcs-Git: https://salsa.debian.org/debiangames-team/openjk.git
+Vcs-Browser: https://salsa.debian.org/debiangames-team/openjk
 Homepage: https://github.com/JACoders/OpenJK
 
 Package: openjk-academy

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

[openjk] 11/23: [MP] Fix for holocron mode to disallow saber styles that aren't known

2018-01-11 Thread Simon McVittie

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

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

commit 18f20494dffbf12c2167a1c92dbea4aae70fdeb9
Author: Razish 
Date:   Mon Dec 25 10:34:06 2017 +1100

[MP] Fix for holocron mode to disallow saber styles that aren't known
---
 codemp/game/w_force.c | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/codemp/game/w_force.c b/codemp/game/w_force.c
index 64e4f87..034df35 100644
--- a/codemp/game/w_force.c
+++ b/codemp/game/w_force.c
@@ -4793,6 +4793,20 @@ void HolocronUpdate(gentity_t *self)
{
self->client->ps.fd.forcePowerLevel[i] 
= FORCE_LEVEL_1;
}
+
+   //make sure that the player's saber stance is 
reset so they can't continue to use that stance when they don't have the skill 
for it anymore.
+   if ( self->client->saber[0].model[0] && 
self->client->saber[1].model[0] )
+   { //dual
+   self->client->ps.fd.saberAnimLevelBase 
= self->client->ps.fd.saberAnimLevel = self->client->ps.fd.saberDrawAnimLevel = 
SS_DUAL;
+   }
+   else if ( (self->client->saber[0].saberFlags & 
SFL_TWO_HANDED) )
+   { //staff
+   self->client->ps.fd.saberAnimLevel = 
self->client->ps.fd.saberDrawAnimLevel = SS_STAFF;
+   }
+   else
+   {
+   self->client->ps.fd.saberAnimLevelBase 
= self->client->ps.fd.saberAnimLevel = self->client->ps.fd.saberDrawAnimLevel = 
SS_MEDIUM;
+   }
}
else
{

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

[nexuiz] 01/01: Set Vcs-* to point to salsa.debian.org

2018-01-11 Thread Simon McVittie

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

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

commit c829200e33382019eaf16c23d103669ac688f30f
Author: Simon McVittie 
Date:   Thu Jan 11 17:29:56 2018 +

Set Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a342a93..28568cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nexuiz (2.5.2+dp-7) UNRELEASED; urgency=medium
   * Use debhelper compat level 11
   * Configure for DEP-14 git branch names (debian/master,
 upstream/latest)
+  * Set Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie   Sun, 10 Dec 2017 18:57:10 +
 
diff --git a/debian/control b/debian/control
index 74929db..b34bbd7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends:
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Homepage: http://www.alientrap.org/games/nexuiz
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/nexuiz.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/nexuiz.git
+Vcs-Git: https://salsa.debian.org/games-team/nexuiz.git
+Vcs-Browser: https://salsa.debian.org/games-team/nexuiz
 
 Package: nexuiz
 Architecture: all

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

[nexuiz] branch debian/master updated (09b98b1 -> c829200)

2018-01-11 Thread Simon McVittie

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

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

  from  09b98b1   Configure for DEP-14 git branch names (debian/master, 
upstream/latest)
   new  c829200   Set Vcs-* to point to salsa.debian.org

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

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

[nexuiz-data] branch debian/master updated (0b12276 -> f0480d3)

2018-01-11 Thread Simon McVittie

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

smcv pushed a change to branch debian/master
in repository nexuiz-data.

  from  0b12276   2.5.2-7
   new  f0480d3   Change Vcs-* to point to salsa.debian.org

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

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

[nexuiz-data] 01/01: Change Vcs-* to point to salsa.debian.org

2018-01-11 Thread Simon McVittie

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

smcv pushed a commit to branch debian/master
in repository nexuiz-data.

commit f0480d351afaaa583165ac845bcb90261a5894bf
Author: Simon McVittie 
Date:   Thu Jan 11 17:31:45 2018 +

Change Vcs-* to point to salsa.debian.org
---
 debian/changelog | 6 ++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cc24e5..c879b0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nexuiz-data (2.5.2-8) UNRELEASED; urgency=medium
+
+  * Change Vcs-* to point to salsa.debian.org
+
+ -- Simon McVittie   Thu, 11 Jan 2018 17:31:34 +
+
 nexuiz-data (2.5.2-7) unstable; urgency=low
 
   [ Anton Balashov ]
diff --git a/debian/control b/debian/control
index 87c21aa..4fc0629 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends-Indep:
  p7zip-full,
 Standards-Version: 4.1.3
 Homepage: http://www.alientrap.org/games/nexuiz/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/nexuiz-data.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/nexuiz-data.git
+Vcs-Git: https://salsa.debian.org/games-team/nexuiz-data.git
+Vcs-Browser: https://salsa.debian.org/games-team/nexuiz-data
 
 Package: nexuiz-data
 Architecture: all

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

r16084 - in packages: attic trunk

2018-01-11 Thread Juhani Numminen

Author: jsonic-guest
Date: 2018-01-11 23:07:38 + (Thu, 11 Jan 2018)
New Revision: 16084

Added:
   packages/attic/pegsolitaire-svn-save/
Removed:
   packages/trunk/pegsolitaire/
Log:
Moving pegsolitaire from trunk to attic. Please use 
https://salsa.debian.org/games-team/pegsolitaire instead.


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

[hexalate] 03/03: Update Standards-Version to 4.1.3.

2018-01-11 Thread Unit 193

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

unit193-guest pushed a commit to branch master
in repository hexalate.

commit 8874575d91a1e5417745736b04466d9e54bf6af1
Author: Unit 193 
Date:   Fri Jan 12 00:05:06 2018 -0500

Update Standards-Version to 4.1.3.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 1b80cc5..7d98126 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10),
pkg-config,
qtbase5-dev,
qttools5-dev-tools
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
 Homepage: https://gottcode.org/hexalate/
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/hexalate.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-games/hexalate.git

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

[hexalate] 01/03: New upstream version 1.1.2

2018-01-11 Thread Unit 193

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

unit193-guest pushed a commit to branch master
in repository hexalate.

commit 79acc87bcaeda2c9d8bef157331a03a57160957b
Author: Unit 193 
Date:   Fri Jan 12 00:04:16 2018 -0500

New upstream version 1.1.2
---
 NEWS  | 4 
 hexalate.pro  | 9 ++---
 mac_deploy.sh | 2 +-
 windows/installer.nsi | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index b2c8984..ad0cf4c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.1.2
+-
+* FIXED: Could not compile with Qt 5.10.
+
 1.1.1
 -
 * FIXED: Did not always install translations in Linux.
diff --git a/hexalate.pro b/hexalate.pro
index 801e231..6d8f95c 100644
--- a/hexalate.pro
+++ b/hexalate.pro
@@ -1,4 +1,7 @@
-lessThan(QT_VERSION, 5.2) {
+lessThan(QT_MAJOR_VERSION, 5) {
+   error("Hexalate requires Qt 5.2 or greater")
+}
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
error("Hexalate requires Qt 5.2 or greater")
 }
 
@@ -7,7 +10,7 @@ QT += widgets
 CONFIG += warn_on c++11
 
 DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051000
 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
 
 # Allow in-tree builds
@@ -18,7 +21,7 @@ DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
 }
 
 # Set program version
-VERSION = 1.1.1
+VERSION = 1.1.2
 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\"
 
 # Set program name
diff --git a/mac_deploy.sh b/mac_deploy.sh
index 65360b7..e9e00fe 100755
--- a/mac_deploy.sh
+++ b/mac_deploy.sh
@@ -2,7 +2,7 @@
 
 APP='Hexalate'
 BUNDLE="$APP.app"
-VERSION='1.1.1'
+VERSION='1.1.2'
 
 # Remove any previous disk folder or DMG
 echo -n 'Preparing... '
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 5246dcf..ad3b0f4 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -4,7 +4,7 @@
 !define APPNAME "Hexalate"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 1
-!define VERSIONPATCH 1
+!define VERSIONPATCH 2
 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}"
 !define ABOUTURL "https://gottcode.org/hexalate/;
 

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

[hexalate] branch pristine-tar updated (854bac0 -> 4bc2029)

2018-01-11 Thread Unit 193

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

unit193-guest pushed a change to branch pristine-tar
in repository hexalate.

  from  854bac0   pristine-tar data for hexalate_1.1.1.orig.tar.gz
   new  4bc2029   pristine-tar data for hexalate_1.1.2.orig.tar.gz

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:
 hexalate_1.1.2.orig.tar.gz.delta | Bin 0 -> 3115 bytes
 hexalate_1.1.2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 hexalate_1.1.2.orig.tar.gz.delta
 create mode 100644 hexalate_1.1.2.orig.tar.gz.id

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

[hexalate] 01/01: pristine-tar data for hexalate_1.1.2.orig.tar.gz

2018-01-11 Thread Unit 193

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

unit193-guest pushed a commit to branch pristine-tar
in repository hexalate.

commit 4bc20291ed9b8de5ea78fd7d41483bcfddf701ee
Author: Unit 193 
Date:   Fri Jan 12 00:04:23 2018 -0500

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

diff --git a/hexalate_1.1.2.orig.tar.gz.delta b/hexalate_1.1.2.orig.tar.gz.delta
new file mode 100644
index 000..4478a0c
Binary files /dev/null and b/hexalate_1.1.2.orig.tar.gz.delta differ
diff --git a/hexalate_1.1.2.orig.tar.gz.id b/hexalate_1.1.2.orig.tar.gz.id
new file mode 100644
index 000..7eebe98
--- /dev/null
+++ b/hexalate_1.1.2.orig.tar.gz.id
@@ -0,0 +1 @@
+05be70e4fe36ae1a566414eb4b393ff19ea10216

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

[hexalate] branch master updated (cddc796 -> 8874575)

2018-01-11 Thread Unit 193

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

unit193-guest pushed a change to branch master
in repository hexalate.

  from  cddc796   d/rules: Drop --parallel as this is default with compat 
10.
   new  79acc87   New upstream version 1.1.2
   new  e68d3b6   Updated version 1.1.2 from 'upstream/1.1.2'
   new  8874575   Update Standards-Version to 4.1.3.

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:
 NEWS  | 4 
 debian/control| 2 +-
 hexalate.pro  | 9 ++---
 mac_deploy.sh | 2 +-
 windows/installer.nsi | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

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

[hexalate] branch upstream updated (a4c363e -> 79acc87)

2018-01-11 Thread Unit 193

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

unit193-guest pushed a change to branch upstream
in repository hexalate.

  from  a4c363e   New upstream version 1.1.1
   new  79acc87   New upstream version 1.1.2

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:
 NEWS  | 4 
 hexalate.pro  | 9 ++---
 mac_deploy.sh | 2 +-
 windows/installer.nsi | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

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

[hexalate] annotated tag upstream/1.1.2 created (now 2f976e0)

2018-01-11 Thread Unit 193

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

unit193-guest pushed a change to annotated tag upstream/1.1.2
in repository hexalate.

at  2f976e0   (tag)
   tagging  79acc87bcaeda2c9d8bef157331a03a57160957b (commit)
  replaces  upstream/1.1.1
 tagged by  Unit 193
on  Fri Jan 12 00:04:23 2018 -0500

- Log -
Upstream version 1.1.2

Unit 193 (1):
  New upstream version 1.1.2

---

No new revisions were added by this update.

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

[hexalate] 02/03: Updated version 1.1.2 from 'upstream/1.1.2'

2018-01-11 Thread Unit 193

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

unit193-guest pushed a commit to branch master
in repository hexalate.

commit e68d3b604b297dd8a15d1af8f2f83919e25a4149
Merge: cddc796 79acc87
Author: Unit 193 
Date:   Fri Jan 12 00:04:23 2018 -0500

Updated version 1.1.2 from 'upstream/1.1.2'

with Debian dir 8a74ed47a771fad658662af57aca23e519b38a38

 NEWS  | 4 
 hexalate.pro  | 9 ++---
 mac_deploy.sh | 2 +-
 windows/installer.nsi | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

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

57 matches

Mail list logo