[ioquake3] annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u1 created (now 8ab6855)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u1 in repository ioquake3. at 8ab6855 (tag) tagging e2af00bd604d2685b4bdce86b3e1208383a65cfc (commit) replaces debian/1.36+u20140802+gca9eebb-2 tagged by Simon McVittie on Sat Aug 12 10:07:22 2017 -0400 - Log - ioquake3 Debian release 1.36+u20140802+gca9eebb-2+deb8u1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlmPC5oACgkQ4FrhR4+B TE/a3g//eRxOtBxbGaT12UAn+W2AcjvqYjbkyG2E//PLY7nagKsT6RGZmcmBcD6P +Gq9uJ3rFDl1ZSgk3yUkL6N9X9zH6HohPm2P4GKHnofBsrRjTDYCkZwbXOKGuMxx CP8JJI8AMb7lK3tB6TFPEH1P43sx1MV/CoII/R3QB0RnPGnRAQprDP80m8WPQ76R HcSyujsxOKpiEfVxN3Tb+4lTJTo2XhR3Z9voFHgtdmN7F+fy5/RVv9iVdrQlJVGQ 25A4r5i/H5Y+N4kqEeD7DVYYMf79U78mJ8BnEg3GFQbkq4A4Ev41wF+Tglig96D1 6TbX0rf1hUSkOz7U6JEOTa70Jcnda/ZdqXc8sqmXv3Dt5C0+/ItQcP+1xazqkcew YT+bMVSvsdfP9mAn25I7C7Rb46EZ/ImujowKpzEm0cHMsc/3PfM0FMlPpWkoKJAQ c1SbxoT3tNyOBgl43S/D9B53m4MHBK09LlbqAIvPPjsKcllYc0Dom/GB2tY/ch+G Hi5soXHHM1ZvbeKrN1PBrdoXsiav1PzCCBse5I/XmohO1NeXL29Y/Ga3CGclk4eP 91DCoQXCTdv3+Hp4aDvG6OzMoCcfh4fREqaLua3rwfAcatHfDYNuuTEYty7Ww38Q gCMsycIymCen2YAxlNoL/vi7XdsqJGprnmAMyYuggBahTpt2ocg= =KgvF -END PGP SIGNATURE- Simon McVittie (2): d/gbp.conf: switch branch to debian/jessie d/patches: Add patches from upstream fixing security vulnerabilities --- This annotated tag includes the following new commits: new de72015 d/gbp.conf: switch branch to debian/jessie new e2af00b d/patches: Add patches from upstream fixing security vulnerabilities The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- 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/02: 1.36+u20161101+dfsg1-2+deb9u1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20161101+dfsg1-2+deb9u1 in repository ioquake3. commit a52d9c4e2b72a2e41fe380817ebae88dafa149a1 Author: Simon McVittie Date: Mon Aug 7 17:45:22 2017 -0400 1.36+u20161101+dfsg1-2+deb9u1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d225dac..b5ac442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ioquake3 (1.36+u20161101+dfsg1-3) UNRELEASED; urgency=medium +ioquake3 (1.36+u20161101+dfsg1-2+deb9u1) stretch-security; urgency=medium * Reference CVE-2017-6903 in previous changelog entry * Add patch from upstream: @@ -7,7 +7,7 @@ ioquake3 (1.36+u20161101+dfsg1-3) UNRELEASED; urgency=medium + Check buffer boundary exactly in MSG_WriteBits, instead of potentially failing with a few bytes still available - -- Simon McVittie Tue, 14 Mar 2017 22:38:25 + + -- Simon McVittie Tue, 08 Aug 2017 14:58:14 -0400 ioquake3 (1.36+u20161101+dfsg1-2) unstable; urgency=high -- 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/34: Fix crash when pmove_msec is 0
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit e793c0c37c32a38341a284cf405a1fc64b016206
Author: Zack Middleton
Date: Sat Aug 19 01:28:49 2017 -0500
Fix crash when pmove_msec is 0
When pmove_fixed is set to 1, setting pmove_msec to 0 would crash.
---
code/cgame/cg_predict.c | 2 ++
code/game/g_active.c| 2 ++
2 files changed, 4 insertions(+)
diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index de33e4c..6ec837c 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -489,9 +489,11 @@ void CG_PredictPlayerState( void ) {
if ( pmove_msec.integer < 8 ) {
trap_Cvar_Set("pmove_msec", "8");
+ trap_Cvar_Update(&pmove_msec);
}
else if (pmove_msec.integer > 33) {
trap_Cvar_Set("pmove_msec", "33");
+ trap_Cvar_Update(&pmove_msec);
}
cg_pmove.pmove_fixed = pmove_fixed.integer;// | cg_pmove_fixed.integer;
diff --git a/code/game/g_active.c b/code/game/g_active.c
index 775604a..413331e 100644
--- a/code/game/g_active.c
+++ b/code/game/g_active.c
@@ -785,9 +785,11 @@ void ClientThink_real( gentity_t *ent ) {
if ( pmove_msec.integer < 8 ) {
trap_Cvar_Set("pmove_msec", "8");
+ trap_Cvar_Update(&pmove_msec);
}
else if (pmove_msec.integer > 33) {
trap_Cvar_Set("pmove_msec", "33");
+ trap_Cvar_Update(&pmove_msec);
}
if ( pmove_fixed.integer || client->pers.pmoveFixed ) {
--
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+u20161101+dfsg1-2+deb9u1 created (now 3c1ecc4)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/1.36+u20161101+dfsg1-2+deb9u1 in repository ioquake3. at 3c1ecc4 (tag) tagging a52d9c4e2b72a2e41fe380817ebae88dafa149a1 (commit) replaces debian/1.36+u20161101+dfsg1-2 tagged by Simon McVittie on Sat Aug 12 10:06:25 2017 -0400 - Log - ioquake3 Debian release 1.36+u20161101+dfsg1-2+deb9u1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlmPC2EACgkQ4FrhR4+B TE9rZBAAjRhmKzzVlrIE/TIyI2TfH8VlIgmTnkeiFALd4/Aecmqo5rLIGwFWtqi8 CRTyyDUADT9Ik3nLtnE9nfHUwM+wALjtoj6jX3fFYaxsoALJntqah3NcNe1Bq7yV qzexka1T88EDqtkPWoCnEfq44nlTAGiQ7fNbDylkcmOtwBHiNS3/xXH3ta1sP7IW F/FpnS2fWZEcL89MDi6BiF6gUHU3JhJXG7yzIJuah325yjIQbnREB8PDXtupfGwq Lvrcsr6lAkECw0kHh6L2sqt7GjjCywhzzltQac0/3tS5DVZTTcAmSFIRDVjiKfva U4y6/t1n8DymJNwANJmi7zr1rPOFq71HQRrrKtyfbFZqjzK3pFFEsrrbNFPemHVf SZPknpJ/uEDMcSoyLYNb2MPFt6zbO7QdmzO1IDx5whiZH81O+UBSZzYwllhje/rX m6WRfMcxHkjMUDOeYC+L0VniC8BHlcd9prvwPJ66bVa0Ulo6Mn9o6LPYdzouFNUr d6IKYzrdtvG87BhBjDlfFT+l6q50cyDyMH4wT00MaH9I0B2ZVZLr8nIip8Yq/u4k ObwhDY+vsrWzisu34JCGbyF9QPOyGHc2OxADMGwYgXWXXqlqug4jbue2Siea873u ZttldQMmR3Oj65Lvn8W2QfZ06nyKQdyizgjv3XkEBTRMEUsU3EM= =I59e -END PGP SIGNATURE- Simon McVittie (3): Reference CVE-2017-6903 in previous changelog entry Add patch from upstream for CVE-2017-11721 1.36+u20161101+dfsg1-2+deb9u1 --- This annotated tag includes the following new commits: new 10ddd26 Add patch from upstream for CVE-2017-11721 new a52d9c4 1.36+u20161101+dfsg1-2+deb9u1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- 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/34: Update arch in misc/setup for ioq3 changing from i386 to x86
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 00a5339b2722eec678dcf2237b9d996cb9d11467
Author: Zack Middleton
Date: Mon Aug 7 05:39:23 2017 -0500
Update arch in misc/setup for ioq3 changing from i386 to x86
---
misc/setup/Solaris_pkg.sh | 4 ++--
misc/setup/doit| 4 ++--
misc/setup/ioq3demo.sh | 4 ++--
misc/setup/ioquake3.SlackBuild | 4 ++--
misc/setup/ioquake3.sh | 4 ++--
misc/setup/pkg/ioq3ded.sh | 2 +-
misc/setup/pkg/ioquake3.sh | 2 +-
misc/setup/setup.xml.in| 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh
index 650d285..306dbca 100644
--- a/misc/setup/Solaris_pkg.sh
+++ b/misc/setup/Solaris_pkg.sh
@@ -11,7 +11,7 @@ fi
if [ "X`uname -m`" = "Xi86pc" ]; then
- ARCH=i386
+ ARCH=x86
else
ARCH=sparc
fi
@@ -94,7 +94,7 @@ if [ -d ${BUILD_DIR} ]; then
fi
done
- for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamei386.so
qagamei386.so uii386.so
+ for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamex86.so
qagamex86.so uix86.so
do
if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO}
${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
diff --git a/misc/setup/doit b/misc/setup/doit
index 2e082ba..010dc48 100755
--- a/misc/setup/doit
+++ b/misc/setup/doit
@@ -46,8 +46,8 @@ archs=()
for arch in $topdir/build/release-*; do
arch=${arch##*-}
case "$arch" in
- i386) echo "define(HAVE_I386,yes)dnl" >> defines.m4
- copystartscript x86
+ x86) echo "define(HAVE_X86,yes)dnl" >> defines.m4
+ copystartscript $arch
;;
x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
copystartscript $arch
diff --git a/misc/setup/ioq3demo.sh b/misc/setup/ioq3demo.sh
index 05df7ff..b710224 100644
--- a/misc/setup/ioq3demo.sh
+++ b/misc/setup/ioq3demo.sh
@@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
archs=`uname -m`
case "$archs" in
- i?86) archs=i386 ;;
- x86_64) archs="x86_64 i386" ;;
+ i?86) archs=x86 ;;
+ x86_64) archs="x86_64 x86" ;;
ppc64) archs="ppc64 ppc" ;;
esac
diff --git a/misc/setup/ioquake3.SlackBuild b/misc/setup/ioquake3.SlackBuild
index 187d58b..e48d0d3 100644
--- a/misc/setup/ioquake3.SlackBuild
+++ b/misc/setup/ioquake3.SlackBuild
@@ -24,9 +24,9 @@ PKG_VERSION=$VERSION
ARCH=${ARCH:-i586}
if [ "$ARCH" = "i?86" ]; then
- ARCHSUFFIX="i386"
+ ARCHSUFFIX="x86"
elif [ "$ARCH" = "x86_64" ]; then
- ARCHSUFFIX="64"
+ ARCHSUFFIX="x86_64"
fi
BUILD=${BUILD:-1_io}
diff --git a/misc/setup/ioquake3.sh b/misc/setup/ioquake3.sh
index fbef567..6ebc4d1 100644
--- a/misc/setup/ioquake3.sh
+++ b/misc/setup/ioquake3.sh
@@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
archs=`uname -m`
case "$archs" in
- i?86) archs=i386 ;;
- x86_64) archs="x86_64 i386" ;;
+ i?86) archs=x86 ;;
+ x86_64) archs="x86_64 x86" ;;
ppc64) archs="ppc64 ppc" ;;
esac
diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
index 511f4fb..2df6368 100644
--- a/misc/setup/pkg/ioq3ded.sh
+++ b/misc/setup/pkg/ioq3ded.sh
@@ -13,7 +13,7 @@ fi
export LD_LIBRARY_PATH
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
+COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
EXEC_REL=release
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
index 29a050b..fdc7816 100644
--- a/misc/setup/pkg/ioquake3.sh
+++ b/misc/setup/pkg/ioquake3.sh
@@ -13,7 +13,7 @@ fi
export LD_LIBRARY_PATH
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
+COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
EXEC_REL=release
diff --git a/misc/setup/setup.xml.in b/misc/setup/setup.xml.in
index b820101..4b07675 100644
--- a/misc/setup/setup.xml.in
+++ b/misc/setup/setup.xml.in
@@ -24,12 +24,12 @@ ifelse(HAVE_X86_64,yes,dnl
you need the binaries to play the game
)dnl
-ifelse(HAVE_I386,yes,dnl
+ifelse(HAVE_X86,yes,dnl
ioq3 x86 (32 bit) binaries
ioquake3
- ioquake3.i386.tar
+ ioquake3.x86.tar
you need the binaries to play the game
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 10/34: Combine mouse movement events in event queue
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit be1c71d36306637490348a128ecc2245b909c5da
Author: Zack Middleton
Date: Mon Aug 21 19:48:44 2017 -0500
Combine mouse movement events in event queue
Fixes 'Com_QueueEvent: overflow' spam after hitch / map load.
Based on patch by @ec-.
---
code/qcommon/common.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 5d64d68..0359a30 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1961,6 +1961,19 @@ void Com_QueueEvent( int time, sysEventType_t type, int
value, int value2, int p
{
sysEvent_t *ev;
+ // combine mouse movement with previous mouse event
+ if ( type == SE_MOUSE && eventHead != eventTail )
+ {
+ ev = &eventQueue[ ( eventHead + MAX_QUEUED_EVENTS - 1 ) &
MASK_QUEUED_EVENTS ];
+
+ if ( ev->evType == SE_MOUSE )
+ {
+ ev->evValue += value;
+ ev->evValue2 += value2;
+ return;
+ }
+ }
+
ev = &eventQueue[ eventHead & MASK_QUEUED_EVENTS ];
if ( eventHead - eventTail >= MAX_QUEUED_EVENTS )
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 01/02: d/gbp.conf: switch branch to debian/jessie
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u1 in repository ioquake3. commit de720155f776a7437f4e2876e3892a7c9b3b245c Author: Simon McVittie Date: Tue Mar 14 11:54:45 2017 + d/gbp.conf: switch branch to debian/jessie --- debian/changelog | 6 ++ debian/gbp.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 218222a..e8d844b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ioquake3 (1.36+u20140802+gca9eebb-2+deb8u1) jessie-security; urgency=high + + * d/gbp.conf: switch branch to debian/jessie + + -- Simon McVittie Tue, 14 Mar 2017 11:54:04 + + ioquake3 (1.36+u20140802+gca9eebb-2) unstable; urgency=medium * Build-depend on libjpeg-dev for jpeg-turbo transition diff --git a/debian/gbp.conf b/debian/gbp.conf index 137e1d8..e427dfe 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = master +debian-branch = debian/jessie upstream-branch = upstream pristine-tar = True patch-numbers = False -- 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/34: Only allow safe protocols for cURL downloads
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit bae86208f94499fbd49ac8c87289153ad8169a9d
Author: Mickaël Thomas
Date: Wed Aug 16 04:47:27 2017 +0200
Only allow safe protocols for cURL downloads
A malicious server could abuse dangerous protocols such as gopher:// to,
for instance, send mail via SMTP.
---
code/client/cl_curl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c
index 3ff5a3d..5384390 100644
--- a/code/client/cl_curl.c
+++ b/code/client/cl_curl.c
@@ -299,6 +299,8 @@ void CL_cURL_BeginDownload( const char *localName, const
char *remoteURL )
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS,
+ CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP |
CURLPROTO_FTPS);
clc.downloadCURLM = qcurl_multi_init();
if(!clc.downloadCURLM) {
qcurl_easy_cleanup(clc.downloadCURL);
--
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/02: d/patches: Add patches from upstream fixing security vulnerabilities
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u1
in repository ioquake3.
commit e2af00bd604d2685b4bdce86b3e1208383a65cfc
Author: Simon McVittie
Date: Tue Mar 14 11:55:27 2017 +
d/patches: Add patches from upstream fixing security vulnerabilities
- refuse to load potentially auto-downloadable .pk3 files as
ioquake3 renderers, ioquake3 game code, libcurl, or OpenAL drivers
(mitigation: auto-downloading is off by default, and in Debian
we do not dlopen libcurl anyway)
- refuse to load default configuration file names from a .pk3 file
- protect cl_renderer, cl_curllib, s_aldriver configuration variables so
game code cannot set them
- refuse to overwrite files other than *.txt with the dump console
command
- refuse to overwrite files other than *.cfg with the writeconfig
console command
(Closes: #857699; CVE-2017-6903)
---
debian/changelog | 17 -
...-as-.dlls-and-don-t-load-user-config-file.patch | 76 ++
.../Don-t-open-.pk3-files-as-OpenAL-drivers.patch | 33 ++
...file-writing-extension-checks-from-OpenJK.patch | 50 ++
debian/patches/series | 3 +
5 files changed, 177 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8d844b..b82eab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
ioquake3 (1.36+u20140802+gca9eebb-2+deb8u1) jessie-security; urgency=high
* d/gbp.conf: switch branch to debian/jessie
-
- -- Simon McVittie Tue, 14 Mar 2017 11:54:04 +
+ * d/patches: Add patches from upstream fixing security vulnerabilities
+ - refuse to load potentially auto-downloadable .pk3 files as
+ ioquake3 renderers, ioquake3 game code, libcurl, or OpenAL drivers
+ (mitigation: auto-downloading is off by default, and in Debian
+ we do not dlopen libcurl anyway)
+ - refuse to load default configuration file names from a .pk3 file
+ - protect cl_renderer, cl_curllib, s_aldriver configuration variables so
+ game code cannot set them
+ - refuse to overwrite files other than *.txt with the dump console
+ command
+ - refuse to overwrite files other than *.cfg with the writeconfig
+ console command
+ (Closes: #857699; CVE-2017-6903)
+
+ -- Simon McVittie Tue, 14 Mar 2017 22:29:41 +
ioquake3 (1.36+u20140802+gca9eebb-2) unstable; urgency=medium
diff --git
a/debian/patches/security/Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-file.patch
b/debian/patches/security/Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-file.patch
new file mode 100644
index 000..56705a6
--- /dev/null
+++
b/debian/patches/security/Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-file.patch
@@ -0,0 +1,76 @@
+From: SmileTheory
+Date: Mon, 13 Mar 2017 14:14:00 -0700
+Subject: Don't load .pk3s as .dlls,
+ and don't load user config files from .pk3s.
+
+Origin: upstream, 1.37, commit:376267d534476a875d8b9228149c4ee18b74a4fd
+Bug-Debian: https://bugs.debian.org/857699
+---
+ code/client/cl_main.c | 4 ++--
+ code/qcommon/files.c | 6 ++
+ code/sys/sys_main.c | 7 +++
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/code/client/cl_main.c b/code/client/cl_main.c
+index 2fa38af..026ebd0 100644
+--- a/code/client/cl_main.c
b/code/client/cl_main.c
+@@ -3179,7 +3179,7 @@ void CL_InitRef( void ) {
+ Com_Printf( "- Initializing Renderer \n" );
+
+ #ifdef USE_RENDERER_DLOPEN
+- cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE |
CVAR_LATCH);
++ cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE |
CVAR_LATCH | CVAR_PROTECTED);
+
+ Com_sprintf(dllName, sizeof(dllName), "renderer_%s_" ARCH_STRING
DLL_EXT, cl_renderer->string);
+
+@@ -3479,7 +3479,7 @@ void CL_Init( void ) {
+
+ cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE);
+ #ifdef USE_CURL_DLOPEN
+- cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE);
++ cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE |
CVAR_PROTECTED);
+ #endif
+
+ cl_conXOffset = Cvar_Get ("cl_conXOffset", "0", 0);
+diff --git a/code/qcommon/files.c b/code/qcommon/files.c
+index b56411c..e82120e 100644
+--- a/code/qcommon/files.c
b/code/qcommon/files.c
+@@ -1344,12 +1344,18 @@ long FS_FOpenFileRead(const char *filename,
fileHandle_t *file, qboolean uniqueF
+ {
+ searchpath_t *search;
+ long len;
++ qboolean isLocalConfig;
+
+ if(!fs_searchpaths)
+ Com_Error(ERR_FATAL, "Filesystem call made without
initialization");
+
++ isLocalConfig = !strcmp(filename, "autoexec.cfg") || !strcmp(filename,
Q3CONFIG_CFG);
+ for(search = fs_searchpaths; search; search =
[ioquake3] 01/02: Add patch from upstream for CVE-2017-11721
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20161101+dfsg1-2+deb9u1
in repository ioquake3.
commit 10ddd267dc17b0dac4167422beb327f379764cf4
Author: Simon McVittie
Date: Mon Aug 7 17:43:23 2017 -0400
Add patch from upstream for CVE-2017-11721
+ Address read buffer overflow in
MSG_ReadBits (CVE-2017-11721) (Closes: #870725)
+ Check buffer boundary exactly in MSG_WriteBits, instead of
potentially failing with a few bytes still available
---
debian/changelog | 5 +
...al-vmMagic-that-causes-equivalent-native-.patch | 10 +-
...-a-window-by-default-on-new-installations.patch | 4 +-
...er-overflow-in-MSG_ReadBits-MSG_WriteBits.patch | 213 +
debian/patches/series | 1 +
5 files changed, 226 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1c64d99..d225dac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
ioquake3 (1.36+u20161101+dfsg1-3) UNRELEASED; urgency=medium
* Reference CVE-2017-6903 in previous changelog entry
+ * Add patch from upstream:
++ Address read buffer overflow in
+ MSG_ReadBits (CVE-2017-11721) (Closes: #870725)
++ Check buffer boundary exactly in MSG_WriteBits, instead of
+ potentially failing with a few bytes still available
-- Simon McVittie Tue, 14 Mar 2017 22:38:25 +
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 067c7fe..0b10826 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 3b4a8ae..3fcb125 100644
+index 27f5713..dc9b504 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1418,7 +1418,7 @@ Return the searchpath in "startSearch".
+@@ -1426,7 +1426,7 @@ Return the searchpath in "startSearch".
=
*/
@@ -38,7 +38,7 @@ index 3b4a8ae..3fcb125 100644
{
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1442,7 +1442,7 @@ int FS_FindVM(void **startSearch, char *found, int
foundlen, const char *name, i
+@@ -1450,7 +1450,7 @@ int FS_FindVM(void **startSearch, char *found, int
foundlen, const char *name, i
while(search)
{
@@ -47,7 +47,7 @@ index 3b4a8ae..3fcb125 100644
{
dir = search->dir;
-@@ -1465,7 +1465,7 @@ int FS_FindVM(void **startSearch, char *found, int
foundlen, const char *name, i
+@@ -1473,7 +1473,7 @@ int FS_FindVM(void **startSearch, char *found, int
foundlen, const char *name, i
return VMI_COMPILED;
}
}
@@ -57,7 +57,7 @@ index 3b4a8ae..3fcb125 100644
pack = search->pack;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index b965690..6847ee1 100644
+index da89f15..8648afe 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -627,7 +627,7 @@ qboolean FS_FileExists( const char *file );
diff --git
a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
index 7dd5735..2d9b3fc 100644
---
a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
+++
b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE |
CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE |
CVAR_LATCH );
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 30803e2..c60ad40 100644
+index 7b9c21a..035e02c 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
-@@ -1186,8 +1186,8 @@ void R_Register( void )
+@@ -1182,8 +1182,8 @@ void R_Register( void )
ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE |
CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE |
CVAR_LATCH);
diff --git
a/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
b/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
new file mode 100644
index 000..f44bc70
--- /dev/null
+++
b/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
@@ -0,0 +1,213 @@
+From: Zack Middleton
+Date: Wed, 2 Aug 2017 14:55
[ioquake3] 02/34: OpenGL2: Use extension functions with OpenGL versions before 3.0.
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 3f415abe612f5bed3856c921f57e2c8a2d722a6c
Author: SmileTheory
Date: Mon Aug 7 18:00:00 2017 -0700
OpenGL2: Use extension functions with OpenGL versions before 3.0.
---
code/renderercommon/qgl.h| 10 ++-
code/renderergl2/tr_extensions.c | 130 +++
2 files changed, 87 insertions(+), 53 deletions(-)
diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 80fa0a3..8f76c92 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -479,9 +479,12 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
#define GL_HALF_FLOAT_ARB 0x140B
#endif
-// OpenGL 3.0, was GL_EXT_framebuffer_object, GL_EXT_framebuffer_blit,
GL_EXT_framebuffer_multisample, and GL_ARB_vertex_array_object
+// OpenGL 3.0 specific
#define QGL_3_0_PROCS \
GLE(const GLubyte *, GetStringi, GLenum name, GLuint index) \
+
+// GL_ARB_framebuffer_object, built-in to OpenGL 3.0
+#define QGL_ARB_framebuffer_object_PROCS \
GLE(void, BindRenderbuffer, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffers, GLsizei n, const GLuint *renderbuffers) \
GLE(void, GenRenderbuffers, GLsizei n, GLuint *renderbuffers) \
@@ -495,6 +498,9 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
GLE(void, GenerateMipmap, GLenum target) \
GLE(void, BlitFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint
srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
GLenum filter) \
GLE(void, RenderbufferStorageMultisample, GLenum target, GLsizei
samples, GLenum internalformat, GLsizei width, GLsizei height) \
+
+// GL_ARB_vertex_array_object, built-in to OpenGL 3.0
+#define QGL_ARB_vertex_array_object_PROCS \
GLE(void, BindVertexArray, GLuint array) \
GLE(void, DeleteVertexArrays, GLsizei n, const GLuint *arrays) \
GLE(void, GenVertexArrays, GLsizei n, GLuint *arrays) \
@@ -554,6 +560,8 @@ QGL_1_3_PROCS;
QGL_1_5_PROCS;
QGL_2_0_PROCS;
QGL_3_0_PROCS;
+QGL_ARB_framebuffer_object_PROCS;
+QGL_ARB_vertex_array_object_PROCS;
QGL_EXT_direct_state_access_PROCS;
#undef GLE
diff --git a/code/renderergl2/tr_extensions.c b/code/renderergl2/tr_extensions.c
index 7df5295..8447608 100644
--- a/code/renderergl2/tr_extensions.c
+++ b/code/renderergl2/tr_extensions.c
@@ -35,6 +35,8 @@ QGL_1_3_PROCS;
QGL_1_5_PROCS;
QGL_2_0_PROCS;
QGL_3_0_PROCS;
+QGL_ARB_framebuffer_object_PROCS;
+QGL_ARB_vertex_array_object_PROCS;
QGL_EXT_direct_state_access_PROCS;
#undef GLE
@@ -42,6 +44,8 @@ void GLimp_InitExtraExtensions()
{
char *extension;
const char* result[3] = { "...ignoring %s\n", "...using %s\n", "...%s
not found\n" };
+ qboolean q_gl_version_at_least_3_0;
+ qboolean q_gl_version_at_least_3_2;
// Check OpenGL version
sscanf(glConfig.version_string, "%d.%d",
&glRefConfig.openglMajorVersion, &glRefConfig.openglMinorVersion);
@@ -49,6 +53,9 @@ void GLimp_InitExtraExtensions()
ri.Error(ERR_FATAL, "OpenGL 2.0 required!");
ri.Printf(PRINT_ALL, "...using OpenGL %s\n", glConfig.version_string);
+ q_gl_version_at_least_3_0 = (glRefConfig.openglMajorVersion >= 3);
+ q_gl_version_at_least_3_2 = (glRefConfig.openglMajorVersion > 3 ||
(glRefConfig.openglMajorVersion == 3 && glRefConfig.openglMinorVersion > 2));
+
// Check if we need Intel graphics specific fixes.
glRefConfig.intelGraphics = qfalse;
if (strstr((char *)qglGetString(GL_RENDERER), "Intel"))
@@ -72,31 +79,92 @@ void GLimp_InitExtraExtensions()
// OpenGL 2.0, was GL_ARB_shading_language_100, GL_ARB_vertex_program,
GL_ARB_shader_objects, and GL_ARB_vertex_shader
QGL_2_0_PROCS;
- // OpenGL 3.0, was GL_EXT_framebuffer_object, GL_EXT_framebuffer_blit,
GL_EXT_framebuffer_multisample, and GL_ARB_vertex_array_object
+ // OpenGL 3.0 - no matching extension
// QGL_*_PROCS becomes several functions, do not remove {}
- if (glRefConfig.openglMajorVersion >= 3)
+ if (q_gl_version_at_least_3_0)
{
QGL_3_0_PROCS;
+ }
+ // OpenGL 3.0 - GL_ARB_framebuffer_object
+ extension = "GL_ARB_framebuffer_object";
+ glRefConfig.framebufferObject = qfalse;
+ glRefConfig.framebufferBlit = qfalse;
+ glRefConfig.framebufferMultisample = qfalse;
+ if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension))
+ {
glRefConfig.framebufferObject =
!!r_ext_framebuffer_object->integer;
glRefConfig.framebufferBlit = qtrue;
glRefConfig.framebufferMultisample = qtrue;
- qglGetIntegerv(GL_MAX_RENDERBUFFER_SIZE_EXT,
&glRefConfig.maxRenderbufferSize);
- qglGetIntegerv(GL_MAX_COL
[ioquake3] 04/34: Add spawnflags to QUAKED for trigger_multiple
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 0bce5463f735aad509b27f76f5e98b4afb4c5b75
Author: Zack Middleton
Date: Wed Aug 9 17:47:23 2017 -0500
Add spawnflags to QUAKED for trigger_multiple
---
code/game/g_trigger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/g_trigger.c b/code/game/g_trigger.c
index 7461391..489040b 100644
--- a/code/game/g_trigger.c
+++ b/code/game/g_trigger.c
@@ -84,7 +84,7 @@ void Touch_Multi( gentity_t *self, gentity_t *other, trace_t
*trace ) {
multi_trigger( self, other );
}
-/*QUAKED trigger_multiple (.5 .5 .5) ?
+/*QUAKED trigger_multiple (.5 .5 .5) ? RED_ONLY BLUE_ONLY
"wait" : Seconds between triggerings, 0.5 default, -1 = one time only.
"random" wait variance, default is 0
Variable sized repeatable trigger. Must be targeted at one or more entities.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 05/34: Check for all command separators in callTeamVote
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit f0b74a27c97f6b03cc270d0536a77bdfcc1e8fad
Author: Zack Middleton
Date: Wed Aug 9 18:27:39 2017 -0500
Check for all command separators in callTeamVote
Make callTeamVote check for all command separators like in callVote.
It's not exploitable as the only vote option (leader) always uses an
integer argument.
Also the ioquake3 engine remove command separators from client game
commands in Cmd_Args_Sanitize().
---
code/game/g_cmds.c | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index 46a69ca..b02a19e 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1489,9 +1489,16 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) {
trap_Argv( i, &arg2[strlen(arg2)], sizeof( arg2 ) -
strlen(arg2) );
}
- if( strchr( arg1, ';' ) || strchr( arg2, ';' ) ) {
- trap_SendServerCommand( ent-g_entities, "print \"Invalid vote
string.\n\"" );
- return;
+ // check for command separators in arg2
+ for( c = arg2; *c; ++c) {
+ switch(*c) {
+ case '\n':
+ case '\r':
+ case ';':
+ trap_SendServerCommand( ent-g_entities, "print
\"Invalid vote string.\n\"" );
+ return;
+ break;
+ }
}
if ( !Q_stricmp( arg1, "leader" ) ) {
--
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/34: Remove newlines from chat messages in Game VM
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 3f267728c396c39bed6ef40de42422485b7b6794
Author: Zack Middleton
Date: Wed Aug 9 18:34:26 2017 -0500
Remove newlines from chat messages in Game VM
This has no affect due to ioquake3 engine already removing command
separators (which includes newlines) in Cmd_Args_Sanitize().
---
code/game/g_cmds.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index b02a19e..c56a1de 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -928,6 +928,16 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode,
const char *chatText )
}
}
+static void SanitizeChatText( char *text ) {
+ int i;
+
+ for ( i = 0; text[i]; i++ ) {
+ if ( text[i] == '\n' || text[i] == '\r' ) {
+ text[i] = ' ';
+ }
+ }
+}
+
/*
==
@@ -950,6 +960,8 @@ static void Cmd_Say_f( gentity_t *ent, int mode, qboolean
arg0 ) {
p = ConcatArgs( 1 );
}
+ SanitizeChatText( p );
+
G_Say( ent, NULL, mode, p );
}
@@ -982,6 +994,8 @@ static void Cmd_Tell_f( gentity_t *ent ) {
p = ConcatArgs( 2 );
+ SanitizeChatText( p );
+
G_LogPrintf( "tell: %s to %s: %s\n", ent->client->pers.netname,
target->client->pers.netname, p );
G_Say( ent, target, SAY_TELL, p );
// don't tell to the player self if it was already directed to this
player
@@ -1076,6 +1090,8 @@ static void Cmd_Voice_f( gentity_t *ent, int mode,
qboolean arg0, qboolean voice
p = ConcatArgs( 1 );
}
+ SanitizeChatText( p );
+
G_Voice( ent, NULL, mode, p, voiceonly );
}
@@ -1108,6 +1124,8 @@ static void Cmd_VoiceTell_f( gentity_t *ent, qboolean
voiceonly ) {
id = ConcatArgs( 2 );
+ SanitizeChatText( id );
+
G_LogPrintf( "vtell: %s to %s: %s\n", ent->client->pers.netname,
target->client->pers.netname, id );
G_Voice( ent, target, SAY_TELL, id, voiceonly );
// don't tell to the player self if it was already directed to this
player
--
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/34: Fix compiling Cmd_CallTeamVote_f
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 9736e7ff91a45e301da8d8b7e1642ed1b0bb7363
Author: Zack Middleton
Date: Wed Aug 9 19:19:59 2017 -0500
Fix compiling Cmd_CallTeamVote_f
---
code/game/g_cmds.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index c56a1de..4f73c1d 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1468,6 +1468,7 @@ Cmd_CallTeamVote_f
==
*/
void Cmd_CallTeamVote_f( gentity_t *ent ) {
+ char* c;
int i, team, cs_offset;
chararg1[MAX_STRING_TOKENS];
chararg2[MAX_STRING_TOKENS];
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 11/34: Improve keys using international key layouts
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 34d0b7875421ccb3b90251105ff5bf6c301b300a
Author: Zack Middleton
Date: Mon Aug 21 20:20:19 2017 -0500
Improve keys using international key layouts
Always map number row to number keys for AZERTY.
Map Unicode character keys to world keys using scan code.
Based on patches by @mickael9.
---
code/sdl/sdl_input.c | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 4c8ff1f..9d45a57 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -192,7 +192,18 @@ static keyNum_t IN_TranslateSDLToQ3Key( SDL_Keysym
*keysym, qboolean down )
{
keyNum_t key = 0;
- if( keysym->sym >= SDLK_SPACE && keysym->sym < SDLK_DELETE )
+ if( keysym->scancode >= SDL_SCANCODE_1 && keysym->scancode <=
SDL_SCANCODE_0 )
+ {
+ // Always map the number keys as such even if they actually map
+ // to other characters (eg, "1" is "&" on an AZERTY keyboard).
+ // This is required for SDL before 2.0.6, except on Windows
+ // which already had this behavior.
+ if( keysym->scancode == SDL_SCANCODE_0 )
+ key = '0';
+ else
+ key = '1' + keysym->scancode - SDL_SCANCODE_1;
+ }
+ else if( keysym->sym >= SDLK_SPACE && keysym->sym < SDLK_DELETE )
{
// These happen to match the ASCII chars
key = (int)keysym->sym;
@@ -280,6 +291,15 @@ static keyNum_t IN_TranslateSDLToQ3Key( SDL_Keysym
*keysym, qboolean down )
case SDLK_CAPSLOCK: key = K_CAPSLOCK; break;
default:
+ if( !( keysym->sym & SDLK_SCANCODE_MASK ) &&
keysym->scancode <= 95 )
+ {
+ // Map Unicode characters to 95 world
keys using the key's scan code.
+ // FIXME: There aren't enough world
keys to cover all the scancodes.
+ // Maybe create a map of scancode to
quake key at start up and on
+ // key map change; allocate world key
numbers as needed similar
+ // to SDL 1.2.
+ key = K_WORLD_0 + (int)keysym->scancode;
+ }
break;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 03/34: OpenGL2: Force VAO usage on OpenGL 3.0+
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 9d1c6748f594b90836d3aded3ffd15bc3c6461a5
Author: SmileTheory
Date: Tue Aug 8 20:20:11 2017 -0700
OpenGL2: Force VAO usage on OpenGL 3.0+
---
code/renderergl2/tr_extensions.c | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/code/renderergl2/tr_extensions.c b/code/renderergl2/tr_extensions.c
index 8447608..e90f518 100644
--- a/code/renderergl2/tr_extensions.c
+++ b/code/renderergl2/tr_extensions.c
@@ -112,9 +112,17 @@ void GLimp_InitExtraExtensions()
// OpenGL 3.0 - GL_ARB_vertex_array_object
extension = "GL_ARB_vertex_array_object";
glRefConfig.vertexArrayObject = qfalse;
- if (SDL_GL_ExtensionSupported(extension))
+ if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension))
{
- glRefConfig.vertexArrayObject =
!!r_arb_vertex_array_object->integer;
+ if (q_gl_version_at_least_3_0)
+ {
+ // force VAO, core context requires it
+ glRefConfig.vertexArrayObject = qtrue;
+ }
+ else
+ {
+ glRefConfig.vertexArrayObject =
!!r_arb_vertex_array_object->integer;
+ }
QGL_ARB_vertex_array_object_PROCS;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 12/34: Improve client input responsiveness
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit ead54782d05b67e33ba5338fae081ea3c4af45af
Author: Zack Middleton
Date: Mon Aug 21 21:32:24 2017 -0500
Improve client input responsiveness
Move sampling input to the other side of framerate limiter.
Thanks to Alexander "wareya" Nadeau and Juraj "youurayy" Vitko for
pointing this out.
---
code/qcommon/common.c | 2 ++
code/qcommon/qcommon.h | 8
code/sys/sys_main.c| 1 -
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 0359a30..fd9f9b1 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -3162,6 +3162,8 @@ void Com_Frame( void ) {
NET_Sleep(timeVal - 1);
} while(Com_TimeVal(minMsec));
+ IN_Frame();
+
lastTime = com_frameTime;
com_frameTime = Com_EventLoop();
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 07eebe7..b1224ac 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1058,6 +1058,14 @@ int SV_SendQueuedPackets(void);
qboolean UI_GameCommand( void );
qboolean UI_usesUniqueCDKey(void);
+//
+// input interface
+//
+void IN_Init( void *windowData );
+void IN_Frame( void );
+void IN_Shutdown( void );
+void IN_Restart( void );
+
/*
==
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 586e37a..0598f29 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -756,7 +756,6 @@ int main( int argc, char **argv )
while( 1 )
{
- IN_Frame( );
Com_Frame( );
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 14/34: Make input events use earliest possible time
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 63e07afae922050d9b9fec1600044d9e07f088be
Author: Zack Middleton
Date: Mon Aug 21 22:30:32 2017 -0500
Make input events use earliest possible time
SDL doesn't provide exact the exact time that input events happen
so use the earliest possible time that an event could happen.
This make sub-frame input actions such as walking take affect
immediately instead of in the next frame.
Based on patch by Alexander "wareya" Nadeau.
---
code/sdl/sdl_input.c | 101 +++
1 file changed, 53 insertions(+), 48 deletions(-)
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 9d45a57..9abf149 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -51,6 +51,8 @@ static cvar_t *in_joystickUseAnalog = NULL;
static int vidRestartTime = 0;
+static int in_eventTime = 0;
+
static SDL_Window *SDL_window = NULL;
#define CTRL(a) ((a)-'a'+1)
@@ -649,7 +651,7 @@ static void IN_GamepadMove( void )
qboolean pressed = SDL_GameControllerGetButton(gamepad,
SDL_CONTROLLER_BUTTON_A + i);
if (pressed != stick_state.buttons[i])
{
- Com_QueueEvent(0, SE_KEY, K_PAD0_A + i, pressed, 0,
NULL);
+ Com_QueueEvent(in_eventTime, SE_KEY, K_PAD0_A + i,
pressed, 0, NULL);
stick_state.buttons[i] = pressed;
}
}
@@ -729,19 +731,19 @@ static void IN_GamepadMove( void )
// positive to negative/neutral -> keyup
if (!posAnalog && posKey && oldAxis > 0 && axis <= 0)
- Com_QueueEvent(0, SE_KEY, posKey, qfalse, 0,
NULL);
+ Com_QueueEvent(in_eventTime, SE_KEY, posKey,
qfalse, 0, NULL);
// negative to positive/neutral -> keyup
if (!negAnalog && negKey && oldAxis < 0 && axis >= 0)
- Com_QueueEvent(0, SE_KEY, negKey, qfalse, 0,
NULL);
+ Com_QueueEvent(in_eventTime, SE_KEY, negKey,
qfalse, 0, NULL);
// negative/neutral to positive -> keydown
if (!posAnalog && posKey && oldAxis <= 0 && axis > 0)
- Com_QueueEvent(0, SE_KEY, posKey, qtrue, 0,
NULL);
+ Com_QueueEvent(in_eventTime, SE_KEY, posKey,
qtrue, 0, NULL);
// positive/neutral to negative -> keydown
if (!negAnalog && negKey && oldAxis >= 0 && axis < 0)
- Com_QueueEvent(0, SE_KEY, negKey, qtrue, 0,
NULL);
+ Com_QueueEvent(in_eventTime, SE_KEY, negKey,
qtrue, 0, NULL);
stick_state.oldaaxes[i] = axis;
}
@@ -753,7 +755,7 @@ static void IN_GamepadMove( void )
for (i = 0; i < MAX_JOYSTICK_AXIS; i++)
{
if (translatedAxesSet[i])
- Com_QueueEvent(0, SE_JOYSTICK_AXIS, i,
translatedAxes[i], 0, NULL);
+ Com_QueueEvent(in_eventTime, SE_JOYSTICK_AXIS,
i, translatedAxes[i], 0, NULL);
}
}
}
@@ -804,7 +806,7 @@ static void IN_JoyMove( void )
balldx *= 2;
if (abs(balldy) > 1)
balldy *= 2;
- Com_QueueEvent( 0, SE_MOUSE, balldx, balldy, 0, NULL );
+ Com_QueueEvent( in_eventTime, SE_MOUSE, balldx, balldy,
0, NULL );
}
}
@@ -819,7 +821,7 @@ static void IN_JoyMove( void )
qboolean pressed = (SDL_JoystickGetButton(stick, i) !=
0);
if (pressed != stick_state.buttons[i])
{
- Com_QueueEvent( 0, SE_KEY, K_JOY1 + i, pressed,
0, NULL );
+ Com_QueueEvent( in_eventTime, SE_KEY, K_JOY1 +
i, pressed, 0, NULL );
stick_state.buttons[i] = pressed;
}
}
@@ -844,32 +846,32 @@ static void IN_JoyMove( void )
// release event
switch( ((Uint8 *)&stick_state.oldhats)[i] ) {
case SDL_HAT_UP:
- Com_QueueEvent( 0, SE_KEY,
hat_keys[4*i + 0], qfalse, 0, NULL );
+ Com_QueueEvent( in_eventTime,
SE_KEY, hat_keys[4*i + 0], qfalse, 0, NULL );
break;
case SDL_HAT_RIGHT:
-
[ioquake3] annotated tag debian/1.36+u20170908+dfsg1-1 created (now f1f0543)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. at f1f0543 (tag) tagging fc5edf664c491201cfef3849a98c83802cb34fe4 (commit) replaces upstream/1.36+u20170908+dfsg1 tagged by Simon McVittie on Fri Sep 8 11:32:08 2017 +0100 - Log - ioquake3 Debian release 1.36+u20170908+dfsg1-1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlmycagACgkQ4FrhR4+B TE9EyQ/+NYzMWgvLk679afpZtNULUgF0kNrilA/dlOhHdifKeC+uIXc99ESes0ya zJbCQNwmd197QXxz1+H87YNygmatMvC53IiAfiwdDHdJHuESSEKEW1b1xPxd0A7k fR/ff9A8McOGM2RdaukUBsmnxK254v4LyqdQ75YH/QRKx0hnJcw+Gb4dFDdRFBdW +mbO5VqirScx1MEBTp0SKgDpHASLmcSBmwX0e0bLoQE4R0xZiHkUw5HViDYdjFwG GjilYM1TmpPyrL0VMUZAFqVNjVcnh/XAC+S+FNZlCpN3J8VvVCJqR9+Fh5ddD7MW m7mFVCifvW3opy9nM1F3PTKaWntb/+2nDtlh9Y+FCDO9WzNOT+g12Uemw/JImJvN huEDpZYOxppAjGysSlCMEi/DIT2h5YBBMyvw5uGsZpN/QvEyPW3oiOSsll4rVF2u Q2a2Il8FSO0G/Gd6klUUKsmnVBSlx6FIzl/nf3rhCJZKWqMQaSrJ5T/dCZJsfRIP C/Ek1w6RuMvTqKjeQ93bf8v5oVhf319uC8BvrLqXzQy2Q+Xdb8NrZ/Nfuz6h4Cy0 t0Of7iHqgde3FIj70DF5V60+yXA+OojST5t2lHOAnf5msE7zj1GhCGETpAzBjQaT gF5P/LW45kx9wcPITh0Joo24d2CBmmisIKqK3p4gZTUEa0i8UNQ= =IlG/ -END PGP SIGNATURE- Bruno Kleinert (12): Add debian/ directory openarena -> ioquake3 in server manpage Add patchset from personal repository Don't try to build internel speex code copy Fix deprecation warning about dh_clean -k dh_prep needs build dependency debhelper (>= 7) Install id-readme.txt in binary packages Information about packaging games for ioquake3 Forgotten patches from my patchset Update debian changelog Script to export upstream sources from SVN Standards version an fix for deprecated version relation Martin Michlmayr (1): debian/q3arch: add arm64 support Simon McVittie (353): Reset changelog to UNRELEASED Update q3arch.sh from openarena 0.8.5 control: untabify control: add myself to Uploaders Recommend a recent openarena ioquake3: suggest a matching ioquake3-server Install binaries outside the $PATH Update to debhelper 7 compat Convert debian/rules to dh style, and set variables as for openarena Add example wrapper scripts to run OpenArena with this engine Add a .gitignore for debian/ Add patch to not check for pak0.pk3 when running standalone Avoid needing lcc by overriding make variables in rules, rather than by patching Makefile Don't patch out use of ~/.q3a Remove patch to fix strcpy abuse: newer versions from svn don't need this Remove patch that removes LOCAL_HEADERS stuff Remove fallback to baseq3/*.so Remove pioquake3 branding patch Remove patch to rename executables Remove patch to link against libcurl by default Revert removal of credits UI Revert removal of quake3world.com link Don't rename shared objects; only rename binaries at install time Remove Fedora patch working around empty fs_game from openarena servers Don't patch the default master server; we can change it on the command line Remove patch to turn off sv_pure by default Remove patch to default to shared objects Remove OA-specific pak0 check removal Remove patches to set an OpenArena-specific PROTOCOL_VERSION Adapt get-orig-source.sh to get a svn snapshot Refresh patch series Merge commit 'upstream/1.36+svn1788' New upstream version; rebase remaining patches Fix installation paths Improve patch tagging for system libjpeg patch Add my patch from openarena to fix division by zero if misconfigured Add patches allowing protocol to be changed on the command line Add patch for the ability to redirect from a stub QVM to native code Add patches to follow the normal search path for DLLs Add patches to increase arbitrary limits Add patch adding g_humanplayers and g_needpass to server info Save the Debian package version into the executable Remove patch to not ask for CD key for openarena Add patch from openarena for misspellings (ioq3 bug 4692) Add patch from openarena to fix ioquake3 on alpha Refresh patch queue Add patch indicating that kFreeBSD is basically like Linux for our purposes Add an example wrapper script for vanilla Quake 3 Update changelog and package descriptions Adjust README.Debian: the proprietary game does, in fact, seem to work Tag patches that I've sent upstream Simplify regex for debian_version, and include distro name in VERSION Don't omit libjpeg from the repacked "orig" tarball Merge commit 'upstream/1.36+svn1788j' Standards-Version: 3.9.1 (no changes) Convert debian/copyright to DEP-5 and generally chase copyright statemen
[ioquake3] 19/34: New upstream snapshot
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 05e95ddbf5f6c8f14c45f7fc0e0c91fb6294a347
Author: Simon McVittie
Date: Thu Aug 31 22:40:12 2017 +0100
New upstream snapshot
---
debian/changelog | 6 ++
debian/rules | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a96bdd8..7446658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ioquake3 (1.36+u20170827+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Simon McVittie Thu, 31 Aug 2017 22:39:53 +0100
+
ioquake3 (1.36+u20170803+dfsg1-1) unstable; urgency=medium
* New upstream snapshot
diff --git a/debian/rules b/debian/rules
index 2d6a9de..1ecbbc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,10 +91,10 @@ ORIG_SOURCE = ioquake3
ORIG_REPO ?= https://github.com/ioquake/ioq3
ORIG_REL = 1.36
# Empty if packaging a tagged release
-ORIG_REV = 2955f8dadb0c521218b634eb98da41de9c429a51
+ORIG_REV = ad1d0e616e4a4702505ee56fb288121c2c1f7a8f
# 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 = 20170803
+ORIG_DATE = 20170827
ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 20/34: Declare compliance with Debian Policy 4.0.1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 63ea0b0a7396a056661f2fe073d4238403d0e7b7 Author: Simon McVittie Date: Thu Aug 31 22:40:33 2017 +0100 Declare compliance with Debian Policy 4.0.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7446658..327160a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ioquake3 (1.36+u20170827+dfsg1-1) UNRELEASED; urgency=medium * New upstream snapshot + * Declare compliance with Debian Policy 4.0.1 -- Simon McVittie Thu, 31 Aug 2017 22:39:53 +0100 diff --git a/debian/control b/debian/control index 4a7ef2d..abeaaab 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libopusfile-dev, libsdl2-dev (>= 2.0.4), libvorbis-dev, -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Vcs-Git: https://anonscm.debian.org/git/pkg-games/ioquake3.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/ioquake3.git Homepage: http://www.ioquake3.org/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 17/34: New upstream version 1.36+u20170827+dfsg1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 87901a5c4909ecc9155dfb7c644ee2c7d4ab4d60 Merge: 0e31de6 ad1d0e6 Author: Simon McVittie Date: Thu Aug 31 22:37:01 2017 +0100 New upstream version 1.36+u20170827+dfsg1 code/cgame/cg_predict.c | 2 + code/client/cl_curl.c| 2 + code/game/ai_dmq3.c | 21 +++--- code/game/g_active.c | 2 + code/game/g_cmds.c | 32 - code/game/g_trigger.c| 2 +- code/qcommon/common.c| 15 + code/qcommon/qcommon.h | 8 +++ code/renderercommon/qgl.h| 10 ++- code/renderergl2/tr_extensions.c | 138 --- code/sdl/sdl_input.c | 123 -- code/sys/sys_local.h | 6 -- code/sys/sys_main.c | 1 - misc/setup/Solaris_pkg.sh| 4 +- misc/setup/doit | 4 +- misc/setup/ioq3demo.sh | 4 +- misc/setup/ioquake3.SlackBuild | 4 +- misc/setup/ioquake3.sh | 4 +- misc/setup/pkg/ioq3ded.sh| 2 +- misc/setup/pkg/ioquake3.sh | 2 +- misc/setup/setup.xml.in | 4 +- 21 files changed, 253 insertions(+), 137 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] 18/34: Updated version 1.36+u20170827+dfsg1 from 'upstream/1.36+u20170827+dfsg1'
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 2c1575c8cbf12ad7a694146909cb3e5ee6dd101f Merge: d28a6e3 87901a5 Author: Simon McVittie Date: Thu Aug 31 22:37:07 2017 +0100 Updated version 1.36+u20170827+dfsg1 from 'upstream/1.36+u20170827+dfsg1' with Debian dir 61ce8b1021c1f1c8133f4feb60397fcc510ba926 code/cgame/cg_predict.c | 2 + code/client/cl_curl.c| 2 + code/game/ai_dmq3.c | 21 +++--- code/game/g_active.c | 2 + code/game/g_cmds.c | 32 - code/game/g_trigger.c| 2 +- code/qcommon/common.c| 15 + code/qcommon/qcommon.h | 8 +++ code/renderercommon/qgl.h| 10 ++- code/renderergl2/tr_extensions.c | 138 --- code/sdl/sdl_input.c | 123 -- code/sys/sys_local.h | 6 -- code/sys/sys_main.c | 1 - misc/setup/Solaris_pkg.sh| 4 +- misc/setup/doit | 4 +- misc/setup/ioq3demo.sh | 4 +- misc/setup/ioquake3.SlackBuild | 4 +- misc/setup/ioquake3.sh | 4 +- misc/setup/pkg/ioq3ded.sh| 2 +- misc/setup/pkg/ioquake3.sh | 2 +- misc/setup/setup.xml.in | 4 +- 21 files changed, 253 insertions(+), 137 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 13/34: Removing input functions from sys_local.h for last commit
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 5993c63c4e5637a8f3c11adf163ee4542154a0ed Author: Zack Middleton Date: Mon Aug 21 22:27:09 2017 -0500 Removing input functions from sys_local.h for last commit It helps to actually save files before making commits. --- code/sys/sys_local.h | 6 -- 1 file changed, 6 deletions(-) diff --git a/code/sys/sys_local.h b/code/sys/sys_local.h index 96edd98..4398f87 100644 --- a/code/sys/sys_local.h +++ b/code/sys/sys_local.h @@ -28,12 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MINSDL_MINOR 0 #define MINSDL_PATCH 0 -// Input subsystem -void IN_Init( void *windowData ); -void IN_Frame( void ); -void IN_Shutdown( void ); -void IN_Restart( void ); - // Console void CON_Shutdown( void ); void CON_Init( void ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 15/34: Make bots use crusher on other q3tourney6 maps
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit ad1d0e616e4a4702505ee56fb288121c2c1f7a8f
Author: Zack Middleton
Date: Sat Aug 26 23:21:46 2017 -0500
Make bots use crusher on other q3tourney6 maps
Make bots activate crusher on q3tourney6_ctf and mpq3tourney6.
Check if player is inside the crush bounds instead of below the
crusher. There is a jumppad the goes under it in mpq3tourney6.
---
code/game/ai_dmq3.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c
index 6e79665..1a6a665 100644
--- a/code/game/ai_dmq3.c
+++ b/code/game/ai_dmq3.c
@@ -3695,21 +3695,26 @@ void BotMapScripts(bot_state_t *bs) {
strncpy(mapname, Info_ValueForKey( info, "mapname" ),
sizeof(mapname)-1);
mapname[sizeof(mapname)-1] = '\0';
- if (!Q_stricmp(mapname, "q3tourney6")) {
- vec3_t mins = {700, 204, 672}, maxs = {964, 468, 680};
+ if (!Q_stricmp(mapname, "q3tourney6") || !Q_stricmp(mapname,
"q3tourney6_ctf") || !Q_stricmp(mapname, "mpq3tourney6")) {
+ vec3_t mins = {694, 200, 480}, maxs = {968, 472, 680};
vec3_t buttonorg = {304, 352, 920};
//NOTE: NEVER use the func_bobbing in q3tourney6
bs->tfl &= ~TFL_FUNCBOB;
- //if the bot is below the bounding box
+ //crush area is higher in mpq3tourney6
+ if (!Q_stricmp(mapname, "mpq3tourney6")) {
+ mins[2] += 64;
+ maxs[2] += 64;
+ }
+ //if the bot is in the bounding box of the crush area
if (bs->origin[0] > mins[0] && bs->origin[0] < maxs[0]) {
if (bs->origin[1] > mins[1] && bs->origin[1] < maxs[1])
{
- if (bs->origin[2] < mins[2]) {
+ if (bs->origin[2] > mins[2] && bs->origin[2] <
maxs[2]) {
return;
}
}
}
shootbutton = qfalse;
- //if an enemy is below this bounding box then shoot the button
+ //if an enemy is in the bounding box then shoot the button
for (i = 0; i < level.maxclients; i++) {
if (i == bs->client) continue;
@@ -3722,7 +3727,7 @@ void BotMapScripts(bot_state_t *bs) {
//
if (entinfo.origin[0] > mins[0] && entinfo.origin[0] <
maxs[0]) {
if (entinfo.origin[1] > mins[1] &&
entinfo.origin[1] < maxs[1]) {
- if (entinfo.origin[2] < mins[2]) {
+ if (entinfo.origin[2] > mins[2] &&
entinfo.origin[2] < maxs[2]) {
//if there's a team mate below
the crusher
if (BotSameTeam(bs, i)) {
shootbutton = qfalse;
@@ -3750,10 +3755,6 @@ void BotMapScripts(bot_state_t *bs) {
}
}
}
- else if (!Q_stricmp(mapname, "mpq3tourney6")) {
- //NOTE: NEVER use the func_bobbing in mpq3tourney6
- bs->tfl &= ~TFL_FUNCBOB;
- }
}
/*
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 21/34: Declare compliance with Debian Policy 4.1.0
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 2e26616f9fd39c6c8391c0d9ee4782758a8a1819 Author: Simon McVittie Date: Thu Aug 31 23:11:59 2017 +0100 Declare compliance with Debian Policy 4.1.0 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 327160a..a946d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ ioquake3 (1.36+u20170827+dfsg1-1) UNRELEASED; urgency=medium * New upstream snapshot - * Declare compliance with Debian Policy 4.0.1 + * Declare compliance with Debian Policy 4.1.0 -- Simon McVittie Thu, 31 Aug 2017 22:39:53 +0100 diff --git a/debian/control b/debian/control index abeaaab..2a84b82 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libopusfile-dev, libsdl2-dev (>= 2.0.4), libvorbis-dev, -Standards-Version: 4.0.1 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-games/ioquake3.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/ioquake3.git Homepage: http://www.ioquake3.org/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 22/34: Fix going to previous browser source in q3_ui
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit f4d68590c24c93f53458cea581b3504970d0bcf2
Author: Zack Middleton
Date: Sat Sep 2 17:31:01 2017 -0500
Fix going to previous browser source in q3_ui
It wasn't possible to go to previous source from favorites if
sv_master5 cvar wasn't set.
---
code/q3_ui/ui_servers2.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 93e4697..e709925 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -1102,15 +1102,22 @@ int ArenaServers_SetType( int type )
if(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5)
{
char masterstr[2], cvarname[sizeof("sv_master1")];
+ int direction;
- while(type <= UIAS_GLOBAL5)
+ if (type == g_servertype || type == ((g_servertype+1) %
(ARRAY_LEN(master_items)-1))) {
+ direction = 1;
+ } else {
+ direction = -1;
+ }
+
+ while(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5)
{
Com_sprintf(cvarname, sizeof(cvarname), "sv_master%d",
type - UIAS_GLOBAL0);
trap_Cvar_VariableStringBuffer(cvarname, masterstr,
sizeof(masterstr));
if(*masterstr)
break;
- type++;
+ type += direction;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 16/34: Make bots only use q3tourney6 crusher to kill their enemy
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit c3e64d380685419f96f71035c961907b9dc09a9a
Author: Zack Middleton
Date: Sat Aug 26 23:22:54 2017 -0500
Make bots only use q3tourney6 crusher to kill their enemy
Only use the crusher for killing the bot's enemy. This doesn't
affect 1v1 very much but prevents the whole team of bots in CTF
from suddenly shooting at the crusher button. Entering the crusher
bounds was basically instant death.
---
code/game/ai_dmq3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c
index 1a6a665..fdd598a 100644
--- a/code/game/ai_dmq3.c
+++ b/code/game/ai_dmq3.c
@@ -3733,7 +3733,7 @@ void BotMapScripts(bot_state_t *bs) {
shootbutton = qfalse;
break;
}
- else {
+ else if (bs->enemy == i) {
shootbutton = qtrue;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 25/34: Fix team chat box for spectators
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit e152761c284259d3a8a3728d60705f3aa3480f54
Author: Zack Middleton
Date: Sat Sep 2 17:57:24 2017 -0500
Fix team chat box for spectators
Make spectators use green background for team chat box when following
players. The team chat messages are from spectators not the team of
the followed player.
Make spectators draw team chat box even when not following a player.
---
code/cgame/cg_draw.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
index 9566682..afe0941 100644
--- a/code/cgame/cg_draw.c
+++ b/code/cgame/cg_draw.c
@@ -1374,12 +1374,12 @@ static void CG_DrawTeamInfo( void ) {
h = (cgs.teamChatPos - cgs.teamLastChatPos) * TINYCHAR_HEIGHT;
- if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_RED ) {
+ if ( cgs.clientinfo[cg.clientNum].team == TEAM_RED ) {
hcolor[0] = 1.0f;
hcolor[1] = 0.0f;
hcolor[2] = 0.0f;
hcolor[3] = 0.33f;
- } else if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) {
+ } else if ( cgs.clientinfo[cg.clientNum].team == TEAM_BLUE ) {
hcolor[0] = 0.0f;
hcolor[1] = 0.0f;
hcolor[2] = 1.0f;
@@ -2582,12 +2582,12 @@ static void CG_Draw2D(stereoFrame_t stereoFrame)
#endif
CG_DrawReward();
}
-
- if ( cgs.gametype >= GT_TEAM ) {
+ }
+
+ if ( cgs.gametype >= GT_TEAM ) {
#ifndef MISSIONPACK
- CG_DrawTeamInfo();
+ CG_DrawTeamInfo();
#endif
- }
}
CG_DrawVote();
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 26/34: Don't draw crosshair 0 in Team Arena setup menu
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 8192f66b392893c3880a2175bb2b9ebefd0854b6
Author: Zack Middleton
Date: Sat Sep 2 18:11:01 2017 -0500
Don't draw crosshair 0 in Team Arena setup menu
Don't draw crosshair 0 in Team Arena setup menu. It isn't drawn
in CGame. Wrap cg_drawCrosshair in missionpack menu like CGame
instead of treating as index 0 which is no longer drawn.
---
code/ui/ui_main.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index 73d3f60..05d9bbc 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -1777,10 +1777,10 @@ static void UI_DrawRedBlue(rectDef_t *rect, float
scale, vec4_t color, int textS
}
static void UI_DrawCrosshair(rectDef_t *rect, float scale, vec4_t color) {
- trap_R_SetColor( color );
- if (uiInfo.currentCrosshair < 0 || uiInfo.currentCrosshair >=
NUM_CROSSHAIRS) {
- uiInfo.currentCrosshair = 0;
+ if (!uiInfo.currentCrosshair) {
+ return;
}
+ trap_R_SetColor( color );
UI_DrawHandlePic( rect->x, rect->y - rect->h, rect->w, rect->h,
uiInfo.uiDC.Assets.crosshairShader[uiInfo.currentCrosshair]);
trap_R_SetColor( NULL );
}
@@ -5192,7 +5192,10 @@ void _UI_Init( qboolean inGameLoad ) {
// sets defaults for ui temp cvars
uiInfo.effectsColor =
gamecodetoui[(int)trap_Cvar_VariableValue("color1")-1];
- uiInfo.currentCrosshair =
(int)trap_Cvar_VariableValue("cg_drawCrosshair");
+ uiInfo.currentCrosshair =
(int)trap_Cvar_VariableValue("cg_drawCrosshair") % NUM_CROSSHAIRS;
+ if (uiInfo.currentCrosshair < 0) {
+ uiInfo.currentCrosshair = 0;
+ }
trap_Cvar_Set("ui_mousePitch", (trap_Cvar_VariableValue("m_pitch") >=
0) ? "0" : "1");
uiInfo.serverStatus.currentServerCinematic = -1;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 30/34: Disable DPI scaling on Windows
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 5f743bdb229cc80e2ce3dc4b8b6c42ec3d552114 Author: Zack Middleton Date: Thu Sep 7 21:09:46 2017 -0500 Disable DPI scaling on Windows Windows DPI scaling prevents using full monitor resolution in fullscreen mode. --- code/sys/win_manifest.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/code/sys/win_manifest.xml b/code/sys/win_manifest.xml index 2055dc9..dccbcf5 100644 --- a/code/sys/win_manifest.xml +++ b/code/sys/win_manifest.xml @@ -28,4 +28,10 @@ + + + http://schemas.microsoft.com/SMI/2005/WindowsSettings";>True/PM + http://schemas.microsoft.com/SMI/2016/WindowsSettings";>PerMonitorV2, PerMonitor + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 27/34: Make client for Windows x86_64 use OpenAL64.dll by default
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit c2ce1c2f512223f786a1f724cfcbf9f0efe35b8f Author: Zack Middleton Date: Mon Sep 4 20:02:17 2017 -0500 Make client for Windows x86_64 use OpenAL64.dll by default ioquake3.x86_64.exe can't load x86 OpenAL32.dll. Using separate library names allows shipping OpenAL for both architectures. Though since the dll name is saved in the config file, using both clients on the same computer will cause one client arch to always try to load the wrong OpenAL dll and then fallback to the correct default OpenAL dll. I guess it could be fixed by using separate cvar names for s_alDriver. --- code/client/snd_openal.c | 4 +++- misc/nsis/Makefile | 9 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index dc1d817..5ba5c7c 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -2206,7 +2206,9 @@ static ALCdevice *alCaptureDevice; static cvar_t *s_alCapture; #endif -#ifdef _WIN32 +#if defined(_WIN64) +#define ALDRIVER_DEFAULT "OpenAL64.dll" +#elif defined(_WIN32) #define ALDRIVER_DEFAULT "OpenAL32.dll" #elif defined(__APPLE__) #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" diff --git a/misc/nsis/Makefile b/misc/nsis/Makefile index d56fbde..3875e4e 100644 --- a/misc/nsis/Makefile +++ b/misc/nsis/Makefile @@ -38,6 +38,13 @@ ifndef SDLDLL SDLDLL=SDL2.dll endif endif +ifndef OPENALDLL + ifeq ($(ARCH),x86_64) + OPENALDLL=OpenAL64.dll + else + OPENALDLL=OpenAL32.dll + endif +endif DEFINES= ifeq ($(USE_RENDERER_DLOPEN),1) @@ -63,7 +70,7 @@ endif all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe ioquake3.$(ARCH).nsi: ioquake3.nsi.in - sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/mingw32/$(PLATFORM)/g;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/g' < $< > $@ + sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/mingw32/$(PLATFORM)/g;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/g;s/OpenAL32.dll/$(OPENALDLL)/g' < $< > $@ ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi makensis $(DEFINES) ioquake3.$(ARCH).nsi -- 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+u20161101+dfsg1 created (now e0fa53f)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag upstream/1.36+u20161101+dfsg1 in repository ioquake3. at e0fa53f (tag) tagging ebf55caf9a1f272ed9547f5861e7ee8544e61595 (commit) replaces upstream/1.36+u20160914+dfsg1 tagged by Simon McVittie on Sat Nov 5 18:23:50 2016 + - Log - Upstream version 1.36+u20161101+dfsg1 Simon McVittie (7): Fix mis-spellings of "separating" as "seperating" Introduce NOTSHLIBLDFLAGS, used to link executables only Pick up date from SOURCE_DATE_EPOCH, for reproducible builds snd_wavelet: avoid undefined pointer below array bounds UI_BuildFindPlayerList: avoid array underflow UI_BuildFindPlayerList: make a sizeof() more obviously correct New upstream version 1.36+u20161101+dfsg1 SmileTheory (12): OpenGL2: Some tr_image refactoring/cleanup. Default cl_renderer to opengl2. OpenGL2: Non-square merged lightmaps. OpenGL2: Store vertex colors and hdr lightmaps/lightgrid as RGBA16. OpenGL2: Workaround for multiple deforms on MD3 mesh. OpenGL2: Fix fog color. OpenGL2: Remove half float support. OpenGL2: Remove check for GL_ARB_texture_non_power_of_two. OpenGL2: Faster mipmap generation. OpenGL2: Load images with "_nh" suffix as parallax normalmaps. OpenGL2: Prioritize loading .png images over all others besides .dds. OpenGL2: Add more ambient to lightmapped materials. Tim Angus (4): Merge pull request #223 from smcv/seperating Merge pull request #224 from smcv/notshlib Merge pull request #225 from smcv/reproducible-date Merge pull request #226 from smcv/underflow Zack Middleton (6): Offer post-crash safe settings on a per-mod basis Avoid shuting down opus voip codec multiple times Handle ERR_DROP during Com_GameRestart Fix removing/creating PID file for base game when switching to/from mods Prefer mingw-w64 for cross-compiling Allow overriding platform in NSIS installer --- 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] 24/34: Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 5d88c6fdeef5cd85aae20c7878cc2f39faf4e91d
Author: Zack Middleton
Date: Sat Sep 2 17:39:45 2017 -0500
Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack
ui_smallFont and ui_bigFont are for missionpack HUD font size
selection. cg_noTaunt disables missionpack taunt voice chats.
---
code/cgame/cg_local.h | 2 ++
code/cgame/cg_main.c | 8 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 822c257..1800bda 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -1167,9 +1167,11 @@ extern vmCvar_tcg_timescaleFadeEnd;
extern vmCvar_tcg_timescaleFadeSpeed;
extern vmCvar_tcg_timescale;
extern vmCvar_tcg_cameraMode;
+#ifdef MISSIONPACK
extern vmCvar_t cg_smallFont;
extern vmCvar_t cg_bigFont;
extern vmCvar_tcg_noTaunt;
+#endif
extern vmCvar_tcg_noProjectileTrail;
extern vmCvar_tcg_oldRail;
extern vmCvar_tcg_oldRocket;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 780ed3e..8da095a 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -175,9 +175,11 @@ vmCvar_t cg_cameraOrbitDelay;
vmCvar_t cg_timescaleFadeEnd;
vmCvar_t cg_timescaleFadeSpeed;
vmCvar_t cg_timescale;
+#ifdef MISSIONPACK
vmCvar_t cg_smallFont;
vmCvar_t cg_bigFont;
vmCvar_t cg_noTaunt;
+#endif
vmCvar_t cg_noProjectileTrail;
vmCvar_t cg_oldRail;
vmCvar_t cg_oldRocket;
@@ -309,10 +311,12 @@ static cvarTable_t cvarTable[] = {
{ &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO},
{ &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO},
- { &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE},
- { &cg_noProjectileTrail, "cg_noProjectileTrail", "0", CVAR_ARCHIVE},
+#ifdef MISSIONPACK
{ &cg_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE},
{ &cg_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE},
+ { &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE},
+#endif
+ { &cg_noProjectileTrail, "cg_noProjectileTrail", "0", CVAR_ARCHIVE},
{ &cg_oldRail, "cg_oldRail", "1", CVAR_ARCHIVE},
{ &cg_oldRocket, "cg_oldRocket", "1", CVAR_ARCHIVE},
{ &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 29/34: Add Windows application manifest
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit aeaecb4ae581c25b7628ccde0303dbc4a5ea11e1 Author: Zack Middleton Date: Thu Sep 7 21:01:23 2017 -0500 Add Windows application manifest - Use common controls 6 so error dialogs use correct visuals on Windows XP or later! - Specify running as invoker so Windows doesn't guess if it should prompt for admin permission on Vista or later. - Specify compatible with Vista through Windows 10. Tells Windows not to emulate Vista behavior, not sure if it affects anything. Makefile automatically runs windres when manifest changes. --- Makefile | 4 ++-- code/sys/win_manifest.xml | 31 +++ code/sys/win_resource.rc | 6 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 45339aa..44d2862 100644 --- a/Makefile +++ b/Makefile @@ -2665,7 +2665,7 @@ $(B)/client/%.o: $(SYSDIR)/%.c $(B)/client/%.o: $(SYSDIR)/%.m $(DO_CC) -$(B)/client/%.o: $(SYSDIR)/%.rc +$(B)/client/win_resource.o: $(SYSDIR)/win_resource.rc $(SYSDIR)/win_manifest.xml $(DO_WINDRES) @@ -2722,7 +2722,7 @@ $(B)/ded/%.o: $(SYSDIR)/%.c $(B)/ded/%.o: $(SYSDIR)/%.m $(DO_DED_CC) -$(B)/ded/%.o: $(SYSDIR)/%.rc +$(B)/ded/win_resource.o: $(SYSDIR)/win_resource.rc $(SYSDIR)/win_manifest.xml $(DO_WINDRES) $(B)/ded/%.o: $(NDIR)/%.c diff --git a/code/sys/win_manifest.xml b/code/sys/win_manifest.xml new file mode 100644 index 000..2055dc9 --- /dev/null +++ b/code/sys/win_manifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sys/win_resource.rc b/code/sys/win_resource.rc index b1c39d5..b9c8c6e 100644 --- a/code/sys/win_resource.rc +++ b/code/sys/win_resource.rc @@ -70,6 +70,12 @@ BEGIN IDS_STRING1 "Quake3" END +/ +// +// Application Manifest +// +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "win_manifest.xml" + #endif// English (U.S.) resources / -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 23/34: Make map names in q3_ui map select menu be uppercase
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 2c22ead0782648e1ff2d5d379d5ae021ea33389c
Author: Zack Middleton
Date: Sat Sep 2 17:35:09 2017 -0500
Make map names in q3_ui map select menu be uppercase
Makes map names match on both pages of start server menu.
---
code/q3_ui/ui_startserver.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
index b4883d4..505f877 100644
--- a/code/q3_ui/ui_startserver.c
+++ b/code/q3_ui/ui_startserver.c
@@ -331,6 +331,7 @@ static void StartServer_LevelshotDraw( void *self ) {
int h;
int n;
const char *info;
+ charmapname[ MAX_NAMELENGTH ];
b = (menubitmap_s *)self;
@@ -366,7 +367,9 @@ static void StartServer_LevelshotDraw( void *self ) {
n = s_startserver.page * MAX_MAPSPERPAGE + b->generic.id - ID_PICTURES;
info = UI_GetArenaInfoByNumber( s_startserver.maplist[ n ]);
- UI_DrawString( x, y, Info_ValueForKey( info, "map" ),
UI_CENTER|UI_SMALLFONT, color_orange );
+ Q_strncpyz( mapname, Info_ValueForKey( info, "map"), MAX_NAMELENGTH );
+ Q_strupr( mapname );
+ UI_DrawString( x, y, mapname, UI_CENTER|UI_SMALLFONT, color_orange );
x = b->generic.x;
y = b->generic.y;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 32/34: Updated version 1.36+u20170908+dfsg1 from 'upstream/1.36+u20170908+dfsg1'
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit 011df9c417b37306f1aaad51ce4061a822ca3c5d Merge: 2e26616 e0bbc25 Author: Simon McVittie Date: Fri Sep 8 10:55:24 2017 +0100 Updated version 1.36+u20170908+dfsg1 from 'upstream/1.36+u20170908+dfsg1' with Debian dir 24105bd1726e994562b1d585b91e2306dd0b9cbe Makefile| 4 ++-- code/cgame/cg_draw.c| 12 ++-- code/cgame/cg_local.h | 2 ++ code/cgame/cg_main.c| 8 ++-- code/client/snd_openal.c| 4 +++- code/game/ai_dmq3.c | 2 +- code/q3_ui/ui_servers2.c| 11 +-- code/q3_ui/ui_startserver.c | 5 - code/renderergl1/tr_shade.c | 7 ++- code/renderergl2/tr_shade.c | 7 ++- code/sys/win_manifest.xml | 37 + code/sys/win_resource.rc| 6 ++ code/ui/ui_main.c | 11 +++ misc/nsis/Makefile | 9 - 14 files changed, 103 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] 33/34: Newer upstream snapshot
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 13726d3141a54ae238a2b7adb17aaa9a52787401
Author: Simon McVittie
Date: Fri Sep 8 10:56:19 2017 +0100
Newer upstream snapshot
---
debian/changelog | 2 +-
debian/rules | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a946d04..1e2d0f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ioquake3 (1.36+u20170827+dfsg1-1) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20170908+dfsg1-1) UNRELEASED; urgency=medium
* New upstream snapshot
* Declare compliance with Debian Policy 4.1.0
diff --git a/debian/rules b/debian/rules
index 1ecbbc4..4af8cdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,10 +91,10 @@ ORIG_SOURCE = ioquake3
ORIG_REPO ?= https://github.com/ioquake/ioq3
ORIG_REL = 1.36
# Empty if packaging a tagged release
-ORIG_REV = ad1d0e616e4a4702505ee56fb288121c2c1f7a8f
+ORIG_REV = 5f743bdb229cc80e2ce3dc4b8b6c42ec3d552114
# 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 = 20170827
+ORIG_DATE = 20170908
ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 28/34: Fix loading renderer DLLs on Windows x86
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1
in repository ioquake3.
commit 6f0736ce9a29ab402b5b0e884055eb81e47e4a4b
Author: Zack Middleton
Date: Thu Sep 7 20:38:10 2017 -0500
Fix loading renderer DLLs on Windows x86
After 'Fix floating point precision loss in renderer', Windows x86
client won't load the renderer DLLs. The problem is a 64 bit modulus.
I couldn't find any reports of this online. However, client with
built-in renderer worked with the 64 bit modulus.
Only tested with mingw-w64.
---
code/renderergl1/tr_shade.c | 7 ++-
code/renderergl2/tr_shade.c | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/code/renderergl1/tr_shade.c b/code/renderergl1/tr_shade.c
index 61a6e0b..57a43c5 100644
--- a/code/renderergl1/tr_shade.c
+++ b/code/renderergl1/tr_shade.c
@@ -239,7 +239,12 @@ static void R_BindAnimatedImage( textureBundle_t *bundle )
{
if ( index < 0 ) {
index = 0; // may happen with shader time offsets
}
- index %= bundle->numImageAnimations;
+
+ // Windows x86 doesn't load renderer DLL with 64 bit modulus
+ //index %= bundle->numImageAnimations;
+ while ( index >= bundle->numImageAnimations ) {
+ index -= bundle->numImageAnimations;
+ }
GL_Bind( bundle->image[ index ] );
}
diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c
index b0ca862..0366247 100644
--- a/code/renderergl2/tr_shade.c
+++ b/code/renderergl2/tr_shade.c
@@ -87,7 +87,12 @@ static void R_BindAnimatedImageToTMU( textureBundle_t
*bundle, int tmu ) {
if ( index < 0 ) {
index = 0; // may happen with shader time offsets
}
- index %= bundle->numImageAnimations;
+
+ // Windows x86 doesn't load renderer DLL with 64 bit modulus
+ //index %= bundle->numImageAnimations;
+ while ( index >= bundle->numImageAnimations ) {
+ index -= bundle->numImageAnimations;
+ }
GL_BindToTMU( bundle->image[ index ], tmu );
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 31/34: New upstream version 1.36+u20170908+dfsg1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit e0bbc25e1970614aa5042a5fc26641bff3206476 Merge: 87901a5 5f743bd Author: Simon McVittie Date: Fri Sep 8 10:55:18 2017 +0100 New upstream version 1.36+u20170908+dfsg1 Makefile| 4 ++-- code/cgame/cg_draw.c| 12 ++-- code/cgame/cg_local.h | 2 ++ code/cgame/cg_main.c| 8 ++-- code/client/snd_openal.c| 4 +++- code/game/ai_dmq3.c | 2 +- code/q3_ui/ui_servers2.c| 11 +-- code/q3_ui/ui_startserver.c | 5 - code/renderergl1/tr_shade.c | 7 ++- code/renderergl2/tr_shade.c | 7 ++- code/sys/win_manifest.xml | 37 + code/sys/win_resource.rc| 6 ++ code/ui/ui_main.c | 11 +++ misc/nsis/Makefile | 9 - 14 files changed, 103 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] annotated tag upstream/1.36+u20170827+dfsg1 created (now 367744d)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag upstream/1.36+u20170827+dfsg1 in repository ioquake3. at 367744d (tag) tagging 87901a5c4909ecc9155dfb7c644ee2c7d4ab4d60 (commit) replaces upstream/1.36+u20170803+dfsg1 tagged by Simon McVittie on Thu Aug 31 22:37:07 2017 +0100 - Log - Upstream version 1.36+u20170827+dfsg1 Mickaël Thomas (1): Only allow safe protocols for cURL downloads Simon McVittie (1): New upstream version 1.36+u20170827+dfsg1 SmileTheory (2): OpenGL2: Use extension functions with OpenGL versions before 3.0. OpenGL2: Force VAO usage on OpenGL 3.0+ Zack Middleton (12): Update arch in misc/setup for ioq3 changing from i386 to x86 Add spawnflags to QUAKED for trigger_multiple Check for all command separators in callTeamVote Remove newlines from chat messages in Game VM Fix compiling Cmd_CallTeamVote_f Fix crash when pmove_msec is 0 Combine mouse movement events in event queue Improve keys using international key layouts Improve client input responsiveness Removing input functions from sys_local.h for last commit Make input events use earliest possible time Make bots use crusher on other q3tourney6 maps --- This annotated tag includes the following new commits: new 00a5339 Update arch in misc/setup for ioq3 changing from i386 to x86 new 3f415ab OpenGL2: Use extension functions with OpenGL versions before 3.0. new 9d1c674 OpenGL2: Force VAO usage on OpenGL 3.0+ new 0bce546 Add spawnflags to QUAKED for trigger_multiple new f0b74a2 Check for all command separators in callTeamVote new 3f26772 Remove newlines from chat messages in Game VM new 9736e7f Fix compiling Cmd_CallTeamVote_f new bae8620 Only allow safe protocols for cURL downloads new e793c0c Fix crash when pmove_msec is 0 new be1c71d Combine mouse movement events in event queue new 34d0b78 Improve keys using international key layouts new ead5478 Improve client input responsiveness new 5993c63 Removing input functions from sys_local.h for last commit new 63e07af Make input events use earliest possible time new ad1d0e6 Make bots use crusher on other q3tourney6 maps new 87901a5 New upstream version 1.36+u20170827+dfsg1 The 16 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+u20170908+dfsg1 created (now b6b4b96)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag upstream/1.36+u20170908+dfsg1 in repository ioquake3. at b6b4b96 (tag) tagging e0bbc25e1970614aa5042a5fc26641bff3206476 (commit) replaces upstream/1.36+u20170827+dfsg1 tagged by Simon McVittie on Fri Sep 8 10:55:24 2017 +0100 - Log - Upstream version 1.36+u20170908+dfsg1 Simon McVittie (1): New upstream version 1.36+u20170908+dfsg1 Zack Middleton (10): Make bots only use q3tourney6 crusher to kill their enemy Fix going to previous browser source in q3_ui Make map names in q3_ui map select menu be uppercase Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack Fix team chat box for spectators Don't draw crosshair 0 in Team Arena setup menu Make client for Windows x86_64 use OpenAL64.dll by default Fix loading renderer DLLs on Windows x86 Add Windows application manifest Disable DPI scaling on Windows --- This annotated tag includes the following new commits: new 00a5339 Update arch in misc/setup for ioq3 changing from i386 to x86 new 3f415ab OpenGL2: Use extension functions with OpenGL versions before 3.0. new 9d1c674 OpenGL2: Force VAO usage on OpenGL 3.0+ new 0bce546 Add spawnflags to QUAKED for trigger_multiple new f0b74a2 Check for all command separators in callTeamVote new 3f26772 Remove newlines from chat messages in Game VM new 9736e7f Fix compiling Cmd_CallTeamVote_f new bae8620 Only allow safe protocols for cURL downloads new e793c0c Fix crash when pmove_msec is 0 new be1c71d Combine mouse movement events in event queue new 34d0b78 Improve keys using international key layouts new ead5478 Improve client input responsiveness new 5993c63 Removing input functions from sys_local.h for last commit new 63e07af Make input events use earliest possible time new ad1d0e6 Make bots use crusher on other q3tourney6 maps new c3e64d3 Make bots only use q3tourney6 crusher to kill their enemy new 87901a5 New upstream version 1.36+u20170827+dfsg1 new f4d6859 Fix going to previous browser source in q3_ui new 2c22ead Make map names in q3_ui map select menu be uppercase new 5d88c6f Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack new e152761 Fix team chat box for spectators new 8192f66 Don't draw crosshair 0 in Team Arena setup menu new c2ce1c2 Make client for Windows x86_64 use OpenAL64.dll by default new 6f0736c Fix loading renderer DLLs on Windows x86 new aeaecb4 Add Windows application manifest new 5f743bd Disable DPI scaling on Windows new e0bbc25 New upstream version 1.36+u20170908+dfsg1 The 27 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+u20170317+dfsg1 created (now c1739ae)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag upstream/1.36+u20170317+dfsg1 in repository ioquake3. at c1739ae (tag) tagging 37c4fe6d7c47aa6bdcdf356c28bfd5417813bd8c (commit) replaces upstream/1.36+u20170227+dfsg1 tagged by Simon McVittie on Sun Mar 19 11:17:38 2017 + - Log - Upstream version 1.36+u20170317+dfsg1 Simon McVittie (1): New upstream version 1.36+u20170317+dfsg1 SmileTheory (4): Don't load .pk3s as .dlls, and don't load user config files from .pk3s. Don't open .pk3 files as OpenAL drivers. Merge some file writing extension checks from OpenJK. Remove FS_Read2(). --- 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] 34/34: 1.36+u20170908+dfsg1-1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/1.36+u20170908+dfsg1-1 in repository ioquake3. commit fc5edf664c491201cfef3849a98c83802cb34fe4 Author: Simon McVittie Date: Fri Sep 8 10:56:44 2017 +0100 1.36+u20170908+dfsg1-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e2d0f2..ebcc135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -ioquake3 (1.36+u20170908+dfsg1-1) UNRELEASED; urgency=medium +ioquake3 (1.36+u20170908+dfsg1-1) unstable; urgency=medium * New upstream snapshot * Declare compliance with Debian Policy 4.1.0 - -- Simon McVittie Thu, 31 Aug 2017 22:39:53 +0100 + -- Simon McVittie Fri, 08 Sep 2017 10:56:30 +0100 ioquake3 (1.36+u20170803+dfsg1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] branch debian/master updated (d28a6e3 -> fc5edf6)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian/master in repository ioquake3. from d28a6e3 1.36+u20170803+dfsg1-1 adds 00a5339 Update arch in misc/setup for ioq3 changing from i386 to x86 adds 3f415ab OpenGL2: Use extension functions with OpenGL versions before 3.0. adds 9d1c674 OpenGL2: Force VAO usage on OpenGL 3.0+ adds 0bce546 Add spawnflags to QUAKED for trigger_multiple adds f0b74a2 Check for all command separators in callTeamVote adds 3f26772 Remove newlines from chat messages in Game VM adds 9736e7f Fix compiling Cmd_CallTeamVote_f adds bae8620 Only allow safe protocols for cURL downloads adds e793c0c Fix crash when pmove_msec is 0 adds be1c71d Combine mouse movement events in event queue adds 34d0b78 Improve keys using international key layouts adds ead5478 Improve client input responsiveness adds 5993c63 Removing input functions from sys_local.h for last commit adds 63e07af Make input events use earliest possible time adds ad1d0e6 Make bots use crusher on other q3tourney6 maps adds 87901a5 New upstream version 1.36+u20170827+dfsg1 adds 2c1575c Updated version 1.36+u20170827+dfsg1 from 'upstream/1.36+u20170827+dfsg1' adds 05e95dd New upstream snapshot adds 63ea0b0 Declare compliance with Debian Policy 4.0.1 adds 2e26616 Declare compliance with Debian Policy 4.1.0 adds c3e64d3 Make bots only use q3tourney6 crusher to kill their enemy adds f4d6859 Fix going to previous browser source in q3_ui adds 2c22ead Make map names in q3_ui map select menu be uppercase adds 5d88c6f Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack adds e152761 Fix team chat box for spectators adds 8192f66 Don't draw crosshair 0 in Team Arena setup menu adds c2ce1c2 Make client for Windows x86_64 use OpenAL64.dll by default adds 6f0736c Fix loading renderer DLLs on Windows x86 adds aeaecb4 Add Windows application manifest adds 5f743bd Disable DPI scaling on Windows adds e0bbc25 New upstream version 1.36+u20170908+dfsg1 adds 011df9c Updated version 1.36+u20170908+dfsg1 from 'upstream/1.36+u20170908+dfsg1' adds 13726d3 Newer upstream snapshot adds fc5edf6 1.36+u20170908+dfsg1-1 No new revisions were added by this update. Summary of changes: Makefile | 4 +- code/cgame/cg_draw.c | 12 ++-- code/cgame/cg_local.h| 2 + code/cgame/cg_main.c | 8 ++- code/cgame/cg_predict.c | 2 + code/client/cl_curl.c| 2 + code/client/snd_openal.c | 4 +- code/game/ai_dmq3.c | 23 +++ code/game/g_active.c | 2 + code/game/g_cmds.c | 32 - code/game/g_trigger.c| 2 +- code/q3_ui/ui_servers2.c | 11 +++- code/q3_ui/ui_startserver.c | 5 +- code/qcommon/common.c| 15 + code/qcommon/qcommon.h | 8 +++ code/renderercommon/qgl.h| 10 ++- code/renderergl1/tr_shade.c | 7 +- code/renderergl2/tr_extensions.c | 138 --- code/renderergl2/tr_shade.c | 7 +- code/sdl/sdl_input.c | 123 -- code/sys/sys_local.h | 6 -- code/sys/sys_main.c | 1 - code/sys/win_manifest.xml| 37 +++ code/sys/win_resource.rc | 6 ++ code/ui/ui_main.c| 11 ++-- debian/changelog | 7 ++ debian/control | 2 +- debian/rules | 4 +- misc/nsis/Makefile | 9 ++- misc/setup/Solaris_pkg.sh| 4 +- misc/setup/doit | 4 +- misc/setup/ioq3demo.sh | 4 +- misc/setup/ioquake3.SlackBuild | 4 +- misc/setup/ioquake3.sh | 4 +- misc/setup/pkg/ioq3ded.sh| 2 +- misc/setup/pkg/ioquake3.sh | 2 +- misc/setup/setup.xml.in | 4 +- 37 files changed, 366 insertions(+), 162 deletions(-) create mode 100644 code/sys/win_manifest.xml -- 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/stretch updated (920652a -> a52d9c4)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian/stretch in repository ioquake3. from 920652a Reference CVE-2017-6903 in previous changelog entry adds 10ddd26 Add patch from upstream for CVE-2017-11721 adds a52d9c4 1.36+u20161101+dfsg1-2+deb9u1 No new revisions were added by this update. Summary of changes: debian/changelog | 9 +- ...al-vmMagic-that-causes-equivalent-native-.patch | 10 +- ...-a-window-by-default-on-new-installations.patch | 4 +- ...er-overflow-in-MSG_ReadBits-MSG_WriteBits.patch | 213 + debian/patches/series | 1 + 5 files changed, 228 insertions(+), 9 deletions(-) create mode 100644 debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.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] branch debian/jessie created (now d70488f)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian/jessie in repository ioquake3. at d70488f Add patch from upstream for CVE-2017-11721 This branch includes the following new commits: new d70488f Add patch from upstream for CVE-2017-11721 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. -- 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/02: pristine-tar data for ioquake3_1.36+u20170908+dfsg1.orig.tar.xz
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch pristine-tar in repository ioquake3. commit bf64dc8f1eaeedbf657378ec535e196fc19dd84e Author: Simon McVittie Date: Fri Sep 8 10:55:24 2017 +0100 pristine-tar data for ioquake3_1.36+u20170908+dfsg1.orig.tar.xz --- ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta | Bin 0 -> 17107 bytes ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta b/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta new file mode 100644 index 000..b3937a7 Binary files /dev/null and b/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta differ diff --git a/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id b/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id new file mode 100644 index 000..8749561 --- /dev/null +++ b/ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id @@ -0,0 +1 @@ +d882043124bd2cefcdcc17c51f420ec20628c1c0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] branch upstream/latest updated (0e31de6 -> e0bbc25)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch upstream/latest in repository ioquake3. from 0e31de6 New upstream version 1.36+u20170803+dfsg1 adds 00a5339 Update arch in misc/setup for ioq3 changing from i386 to x86 adds 3f415ab OpenGL2: Use extension functions with OpenGL versions before 3.0. adds 9d1c674 OpenGL2: Force VAO usage on OpenGL 3.0+ adds 0bce546 Add spawnflags to QUAKED for trigger_multiple adds f0b74a2 Check for all command separators in callTeamVote adds 3f26772 Remove newlines from chat messages in Game VM adds 9736e7f Fix compiling Cmd_CallTeamVote_f adds bae8620 Only allow safe protocols for cURL downloads adds e793c0c Fix crash when pmove_msec is 0 adds be1c71d Combine mouse movement events in event queue adds 34d0b78 Improve keys using international key layouts adds ead5478 Improve client input responsiveness adds 5993c63 Removing input functions from sys_local.h for last commit adds 63e07af Make input events use earliest possible time adds ad1d0e6 Make bots use crusher on other q3tourney6 maps adds 87901a5 New upstream version 1.36+u20170827+dfsg1 adds c3e64d3 Make bots only use q3tourney6 crusher to kill their enemy adds f4d6859 Fix going to previous browser source in q3_ui adds 2c22ead Make map names in q3_ui map select menu be uppercase adds 5d88c6f Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack adds e152761 Fix team chat box for spectators adds 8192f66 Don't draw crosshair 0 in Team Arena setup menu adds c2ce1c2 Make client for Windows x86_64 use OpenAL64.dll by default adds 6f0736c Fix loading renderer DLLs on Windows x86 adds aeaecb4 Add Windows application manifest adds 5f743bd Disable DPI scaling on Windows adds e0bbc25 New upstream version 1.36+u20170908+dfsg1 No new revisions were added by this update. Summary of changes: Makefile | 4 +- code/cgame/cg_draw.c | 12 ++-- code/cgame/cg_local.h| 2 + code/cgame/cg_main.c | 8 ++- code/cgame/cg_predict.c | 2 + code/client/cl_curl.c| 2 + code/client/snd_openal.c | 4 +- code/game/ai_dmq3.c | 23 +++ code/game/g_active.c | 2 + code/game/g_cmds.c | 32 - code/game/g_trigger.c| 2 +- code/q3_ui/ui_servers2.c | 11 +++- code/q3_ui/ui_startserver.c | 5 +- code/qcommon/common.c| 15 + code/qcommon/qcommon.h | 8 +++ code/renderercommon/qgl.h| 10 ++- code/renderergl1/tr_shade.c | 7 +- code/renderergl2/tr_extensions.c | 138 --- code/renderergl2/tr_shade.c | 7 +- code/sdl/sdl_input.c | 123 -- code/sys/sys_local.h | 6 -- code/sys/sys_main.c | 1 - code/sys/win_manifest.xml| 37 +++ code/sys/win_resource.rc | 6 ++ code/ui/ui_main.c| 11 ++-- misc/nsis/Makefile | 9 ++- misc/setup/Solaris_pkg.sh| 4 +- misc/setup/doit | 4 +- misc/setup/ioq3demo.sh | 4 +- misc/setup/ioquake3.SlackBuild | 4 +- misc/setup/ioquake3.sh | 4 +- misc/setup/pkg/ioq3ded.sh| 2 +- misc/setup/pkg/ioquake3.sh | 2 +- misc/setup/setup.xml.in | 4 +- 34 files changed, 356 insertions(+), 159 deletions(-) create mode 100644 code/sys/win_manifest.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] branch debian/master updated (da3a34e -> a90dc93)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian/master in repository iortcw. from da3a34e Fix a read buffer overflow in MSG_ReadBits (CVE-2017-11721) new 4f046ac New upstream version 1.51b+dfsg1 new 1502d19 Updated version 1.51b+dfsg1 from 'upstream/1.51b+dfsg1' new ee20a41 New upstream release new e5d0e53 Declare compliance with Debian Policy 4.0.1 new 4bcc7f0 Declare compliance with Debian Policy 4.1.0 new c9e5e35 d/watch: Mangle version number so the trailing "b" is not considered to be less than +dfsg new f682b67 New upstream version 1.51.b+dfsg1 new 6440059 Updated version 1.51.b+dfsg1 from 'upstream/1.51.b+dfsg1' new a90dc93 1.51.b+dfsg1-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. Summary of changes: MP/HOWTO-Build.txt => HOWTO-Build.txt | 0 MP/Makefile| 4 +- MP/README | 732 - MP/code/botlib/be_aas_main.c | 2 +- MP/code/botlib/be_aas_move.c | 2 +- MP/code/botlib/be_ai_chat.c| 8 +- MP/code/botlib/be_ai_goal.c| 4 +- MP/code/botlib/be_ai_weap.c| 2 +- MP/code/botlib/be_ea.c | 1 - MP/code/botlib/be_interface.c | 4 +- MP/code/botlib/botlib.h| 4 +- MP/code/botlib/l_libvar.c | 22 +- MP/code/botlib/l_libvar.h | 18 +- MP/code/botlib/l_log.c | 2 +- MP/code/botlib/l_precomp.c | 2 +- MP/code/botlib/l_script.c | 2 +- MP/code/botlib/l_struct.c | 2 +- MP/code/cgame/cg_drawtools.c | 2 +- MP/code/cgame/cg_info.c| 2 +- MP/code/cgame/cg_main.c| 4 +- MP/code/cgame/cg_newdraw.c | 11 +- MP/code/cgame/cg_particles.c | 4 - MP/code/cgame/cg_players.c | 2 +- MP/code/cgame/cg_servercmds.c | 71 +- MP/code/cgame/cg_snapshot.c| 13 +- MP/code/cgame/cg_view.c| 23 +- MP/code/cgame/cg_weapons.c | 32 +- MP/code/client/cl_console.c| 6 +- MP/code/client/cl_curl.c | 2 + MP/code/client/cl_keys.c | 6 +- MP/code/client/cl_main.c | 56 +- MP/code/client/client.h| 2 + MP/code/game/ai_cast_script_actions.c | 12 +- MP/code/game/ai_chat.c | 54 +- MP/code/game/ai_cmd.c | 23 +- MP/code/game/ai_dmq3.c | 32 +- MP/code/game/ai_main.c | 10 +- MP/code/game/ai_team.c | 22 +- MP/code/game/bg_animation.c| 64 +- MP/code/game/bg_slidemove.c| 27 +- MP/code/game/g_active.c| 7 +- MP/code/game/g_bot.c | 221 --- MP/code/game/g_client.c| 28 +- MP/code/game/g_cmds.c | 109 ++- MP/code/game/g_local.h | 5 +- MP/code/game/g_main.c | 12 +- MP/code/game/g_script_actions.c| 8 +- MP/code/game/g_session.c | 20 +- MP/code/game/g_svcmds.c| 4 +- MP/code/game/g_team.c | 2 +- MP/code/game/g_utils.c | 1 - MP/code/qcommon/common.c | 11 +- MP/code/qcommon/files.c| 2 +- MP/code/qcommon/huffman.c | 49 +- MP/code/qcommon/msg.c | 45 +- MP/code/qcommon/q_shared.h | 2 +- MP/code/qcommon/qcommon.h | 9 +- MP/code/qcommon/vm.c | 44 +- MP/code/qcommon/vm_armv7l.c| 28 +- MP/code/qcommon/vm_interpreted.c | 14 +- MP/code/qcommon/vm_local.h | 7 +- MP/code/qcommon/vm_x86.c | 8 +- MP/code/rend2/glsl/bokeh_fp.glsl | 18 +- MP/code/rend2/glsl/depthblur_fp.glsl | 8 +- MP/code/r
[ioquake3] 01/01: Add patch from upstream for CVE-2017-11721
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/jessie
in repository ioquake3.
commit d70488f2363446b5f8938087f0e4dbeffe4cae30
Author: Simon McVittie
Date: Sat Aug 12 10:17:16 2017 -0400
Add patch from upstream for CVE-2017-11721
+ Address read buffer overflow in
MSG_ReadBits (CVE-2017-11721) (Closes: #870725)
+ Check buffer boundary exactly in MSG_WriteBits, instead of
potentially failing with a few bytes still available
---
debian/changelog | 10 +
...er-overflow-in-MSG_ReadBits-MSG_WriteBits.patch | 213 +
debian/patches/series | 1 +
3 files changed, 224 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b82eab3..6533e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ioquake3 (1.36+u20140802+gca9eebb-2+deb8u2) jessie-security; urgency=medium
+
+ * Add patch from upstream:
++ Address read buffer overflow in
+ MSG_ReadBits (CVE-2017-11721) (Closes: #870725)
++ Check buffer boundary exactly in MSG_WriteBits, instead of
+ potentially failing with a few bytes still available
+
+ -- Simon McVittie Sat, 12 Aug 2017 10:15:49 -0400
+
ioquake3 (1.36+u20140802+gca9eebb-2+deb8u1) jessie-security; urgency=high
* d/gbp.conf: switch branch to debian/jessie
diff --git
a/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
b/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
new file mode 100644
index 000..6249da6
--- /dev/null
+++
b/debian/patches/security/Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_WriteBits.patch
@@ -0,0 +1,213 @@
+From: Zack Middleton
+Date: Wed, 2 Aug 2017 14:55:10 -0500
+Subject: Fix/improve buffer overflow in MSG_ReadBits/MSG_WriteBits
+
+Prevent reading past end of message in MSG_ReadBits. If read past
+end of msg->data buffer (16348 bytes) the engine could SEGFAULT.
+Make MSG_WriteBits use an exact buffer overflow check instead of
+possibly failing with a few bytes left.
+
+Origin: upstream, commit:d2b1d124d4055c2fcbe5126863487c52fd58cca1
+Bug-CVE: CVE-2017-11721
+Bug-Debian: https://bugs.debian.org/870725
+---
+ code/qcommon/huffman.c | 27 ++-
+ code/qcommon/msg.c | 40 +++-
+ code/qcommon/qcommon.h | 6 +++---
+ 3 files changed, 56 insertions(+), 17 deletions(-)
+
+diff --git a/code/qcommon/huffman.c b/code/qcommon/huffman.c
+index c1b9f24..1f42498 100644
+--- a/code/qcommon/huffman.c
b/code/qcommon/huffman.c
+@@ -279,9 +279,14 @@ int Huff_Receive (node_t *node, int *ch, byte *fin) {
+ }
+
+ /* Get a symbol */
+-void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
++void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int
maxoffset) {
+ bloc = *offset;
+ while (node && node->symbol == INTERNAL_NODE) {
++ if (bloc >= maxoffset) {
++ *ch = 0;
++ *offset = maxoffset + 1;
++ return;
++ }
+ if (get_bit(fin)) {
+ node = node->right;
+ } else {
+@@ -298,11 +303,15 @@ void Huff_offsetReceive (node_t *node, int *ch, byte
*fin, int *offset) {
+ }
+
+ /* Send the prefix code for this node */
+-static void send(node_t *node, node_t *child, byte *fout) {
++static void send(node_t *node, node_t *child, byte *fout, int maxoffset) {
+ if (node->parent) {
+- send(node->parent, node, fout);
++ send(node->parent, node, fout, maxoffset);
+ }
+ if (child) {
++ if (bloc >= maxoffset) {
++ bloc = maxoffset + 1;
++ return;
++ }
+ if (node->right == child) {
+ add_bit(1, fout);
+ } else {
+@@ -312,22 +321,22 @@ static void send(node_t *node, node_t *child, byte
*fout) {
+ }
+
+ /* Send a symbol */
+-void Huff_transmit (huff_t *huff, int ch, byte *fout) {
++void Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset) {
+ int i;
+ if (huff->loc[ch] == NULL) {
+ /* node_t hasn't been transmitted, send a NYT, then the symbol
*/
+- Huff_transmit(huff, NYT, fout);
++ Huff_transmit(huff, NYT, fout, maxoffset);
+ for (i = 7; i >= 0; i--) {
+ add_bit((char)((ch >> i) & 0x1), fout);
+ }
+ } else {
+- send(huff->loc[ch], NULL, fout);
++ send(huff->loc[ch], NULL, fout, maxoffset);
+ }
+ }
+
+-void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset) {
++void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int
maxoffset) {
+ bloc = *offset;
+- send(huff->loc[ch], NULL, fout);
++
[ioquake3] 01/02: pristine-tar data for ioquake3_1.36+u20170827+dfsg1.orig.tar.xz
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch pristine-tar in repository ioquake3. commit d8960d4c58cebe60cff378e150e7843547ef6902 Author: Simon McVittie Date: Thu Aug 31 22:37:07 2017 +0100 pristine-tar data for ioquake3_1.36+u20170827+dfsg1.orig.tar.xz --- ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta | Bin 0 -> 16031 bytes ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta b/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta new file mode 100644 index 000..e8a38b0 Binary files /dev/null and b/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta differ diff --git a/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id b/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id new file mode 100644 index 000..a67cbf7 --- /dev/null +++ b/ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id @@ -0,0 +1 @@ +5c54eacba93b217e467a001c6d2643fb1573cd3d -- 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 (1776be7 -> bf64dc8)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch pristine-tar in repository ioquake3. from 1776be7 pristine-tar data for ioquake3_1.36+u20170803+dfsg1.orig.tar.xz new d8960d4 pristine-tar data for ioquake3_1.36+u20170827+dfsg1.orig.tar.xz new bf64dc8 pristine-tar data for ioquake3_1.36+u20170908+dfsg1.orig.tar.xz The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta | Bin 0 -> 16031 bytes ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id| 1 + ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta | Bin 0 -> 17107 bytes ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id| 1 + 4 files changed, 2 insertions(+) create mode 100644 ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.delta create mode 100644 ioquake3_1.36+u20170827+dfsg1.orig.tar.xz.id create mode 100644 ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.delta create mode 100644 ioquake3_1.36+u20170908+dfsg1.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u2 created (now 6affb42)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/1.36+u20140802+gca9eebb-2+deb8u2 in repository ioquake3. at 6affb42 (tag) tagging d70488f2363446b5f8938087f0e4dbeffe4cae30 (commit) replaces debian/1.36+u20140802+gca9eebb-2+deb8u1 tagged by Simon McVittie on Fri Sep 8 11:35:06 2017 +0100 - Log - ioquake3 Debian release 1.36+u20140802+gca9eebb-2+deb8u2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlmycloACgkQ4FrhR4+B TE8HCBAApccoB1dp8oTU8dTToJKgO+vP62ozK7PPnbUGDvEpK+j8VgZ3V2h8CElS NX7ZyRsN5MlLowWDLvmWLiwILa6iYeft0Xj43M1DS10+bAeVXaYzt5Zz8rSOm6oG bucss3XnY1W/xxEmSNbBXjgryBKLHXDCHVq7XsEpQocNUB7jQMS3k7exiWSWKVzN TD7V3IaKXvnQ3czhR5QJTkzbmdF2bw0DwT+tFoW2M3rd6SeJWseQk4Qe04L6iOCm /GOCCwEYwW0W80qPD+gQASynFzMzqh66nR7EKGv6mLIUk7/hdzsZY/sulrrIrTvd AlXOgnkeTRmsRzHTCes2SHSOLloIgES1KFTeouPgRen2IW3jLT9fU+7PfRBUV34p RcsUhrnLNNi8TkYVmbNGCXtAFRgvB3ohaoHrse0AsRTBQ6jAq3UWwqK7vcshApSz Pnw5ZEk4/SCjsfV01yVfhImfW4zBL4xy+n3xnl/msjF6p7okB9MnA/Klz6wLMsRC 2DtX/MiRIpCGSsHEsCnyg2jIw5OMCniUC3jbdfBGf67ZJza64csM0QbE8w+A9glr HyJg8FmRcwOe4MqIr32NQpCMkMhEtjNrDR7YqV2X8sPI868YsIdPO1+46K4IKsRc isqFXLIFDQov1gatvFHtUafiLqu1Qf3hxzoR9dfpqShJt9sbaDk= =OKfT -END PGP SIGNATURE- Simon McVittie (1): Add patch from upstream for CVE-2017-11721 --- This annotated tag includes the following new commits: new d70488f Add patch from upstream for CVE-2017-11721 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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 03/09: New upstream release
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository iortcw.
commit ee20a4105e38c487a5f7c840334fe064df2d80e5
Author: Simon McVittie
Date: Thu Aug 31 23:10:19 2017 +0100
New upstream release
- Drop patch from previous version, now upstream
---
debian/changelog | 7 +
...buffer-overflow-in-MSG_ReadBits-MSG_Write.patch | 623 -
debian/patches/series | 1 -
debian/rules | 2 +-
4 files changed, 8 insertions(+), 625 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4951d4..95e9b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+iortcw (1.51b+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+- Drop patch from previous version, now upstream
+
+ -- Simon McVittie Thu, 31 Aug 2017 23:09:20 +0100
+
iortcw (1.51+dfsg1-3) unstable; urgency=medium
* d/p/1.52/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch:
diff --git
a/debian/patches/1.52/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
b/debian/patches/1.52/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
deleted file mode 100644
index 1b6cb1c..000
---
a/debian/patches/1.52/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
+++ /dev/null
@@ -1,623 +0,0 @@
-From: MAN-AT-ARMS
-Date: Thu, 3 Aug 2017 00:06:37 -0400
-Subject: All: Fix/improve buffer overflow in MSG_ReadBits/MSG_WriteBits
-
- MP/code/qcommon/huffman.c | 49 ---
- MP/code/qcommon/msg.c | 45 +---
- MP/code/qcommon/qcommon.h | 6 ++---
- SP/code/qcommon/huffman.c | 49 ---
- SP/code/qcommon/msg.c | 65 ++-
- SP/code/qcommon/qcommon.h | 6 ++---
- 6 files changed, 145 insertions(+), 75 deletions(-)
-
-diff --git a/MP/code/qcommon/huffman.c b/MP/code/qcommon/huffman.c
-index 00b007e..88b972c 100644
a/MP/code/qcommon/huffman.c
-+++ b/MP/code/qcommon/huffman.c
-@@ -36,7 +36,7 @@ If you have questions concerning this license or the
applicable additional terms
-
- static int bloc = 0;
-
--voidHuff_putBit( int bit, byte *fout, int *offset ) {
-+void Huff_putBit( int bit, byte *fout, int *offset ) {
- bloc = *offset;
- if ( ( bloc & 7 ) == 0 ) {
- fout[( bloc >> 3 )] = 0;
-@@ -46,17 +46,15 @@ voidHuff_putBit( int bit, byte *fout, int *offset ) {
- *offset = bloc;
- }
-
--int Huff_getBloc(void)
--{
-+int Huff_getBloc( void ) {
- return bloc;
- }
-
--void Huff_setBloc(int _bloc)
--{
-+void Huff_setBloc( int _bloc ) {
- bloc = _bloc;
- }
-
--int Huff_getBit( byte *fin, int *offset ) {
-+int Huff_getBit( byte *fin, int *offset ) {
- int t;
- bloc = *offset;
- t = ( fin[( bloc >> 3 )] >> ( bloc & 7 ) ) & 0x1;
-@@ -286,9 +284,14 @@ int Huff_Receive( node_t *node, int *ch, byte *fin ) {
- }
-
- /* Get a symbol */
--void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset ) {
-+void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset, int
maxoffset ) {
- bloc = *offset;
- while ( node && node->symbol == INTERNAL_NODE ) {
-+ if ( bloc >= maxoffset ) {
-+ *ch = 0;
-+ *offset = maxoffset + 1;
-+ return;
-+ }
- if ( get_bit( fin ) ) {
- node = node->right;
- } else {
-@@ -305,11 +308,15 @@ void Huff_offsetReceive( node_t *node, int *ch, byte
*fin, int *offset ) {
- }
-
- /* Send the prefix code for this node */
--static void send( node_t *node, node_t *child, byte *fout ) {
-+static void send( node_t *node, node_t *child, byte *fout, int maxoffset ) {
- if ( node->parent ) {
-- send( node->parent, node, fout );
-+ send( node->parent, node, fout, maxoffset );
- }
- if ( child ) {
-+ if ( bloc >= maxoffset ) {
-+ bloc = maxoffset + 1;
-+ return;
-+ }
- if ( node->right == child ) {
- add_bit( 1, fout );
- } else {
-@@ -319,22 +326,22 @@ static void send( node_t *node, node_t *child, byte
*fout ) {
- }
-
- /* Send a symbol */
--void Huff_transmit( huff_t *huff, int ch, byte *fout ) {
-+void Huff_transmit( huff_t *huff, int ch, byte *fout, int maxoffset ) {
- int i;
- if ( huff->loc[ch] == NULL ) {
- /* node_t hasn't been transmitted, send a NYT, then the symbol
*/
-- Huff_transmit( huff, NYT, fout );
-+ Huff_transmit( huff, NYT, fout, maxoffset );
- for ( i = 7; i >= 0; i-- ) {
- add_bit( (char)( ( ch >> i ) & 0x1
[iortcw] 02/09: Updated version 1.51b+dfsg1 from 'upstream/1.51b+dfsg1'
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit 1502d19029d7422fc5ce4a9480ccca2e68497a7e Merge: da3a34e 4f046ac Author: Simon McVittie Date: Thu Aug 31 22:48:32 2017 +0100 Updated version 1.51b+dfsg1 from 'upstream/1.51b+dfsg1' with Debian dir 4af06c20e255c5e2e41bfa7351bb37cb073fd848 MP/HOWTO-Build.txt => HOWTO-Build.txt | 0 MP/Makefile | 4 +- MP/README | 732 MP/code/botlib/be_aas_main.c| 2 +- MP/code/botlib/be_aas_move.c| 2 +- MP/code/botlib/be_ai_chat.c | 8 +- MP/code/botlib/be_ai_goal.c | 4 +- MP/code/botlib/be_ai_weap.c | 2 +- MP/code/botlib/be_ea.c | 1 - MP/code/botlib/be_interface.c | 4 +- MP/code/botlib/botlib.h | 4 +- MP/code/botlib/l_libvar.c | 22 +- MP/code/botlib/l_libvar.h | 18 +- MP/code/botlib/l_log.c | 2 +- MP/code/botlib/l_precomp.c | 2 +- MP/code/botlib/l_script.c | 2 +- MP/code/botlib/l_struct.c | 2 +- MP/code/cgame/cg_drawtools.c| 2 +- MP/code/cgame/cg_info.c | 2 +- MP/code/cgame/cg_main.c | 4 +- MP/code/cgame/cg_newdraw.c | 11 +- MP/code/cgame/cg_particles.c| 4 - MP/code/cgame/cg_players.c | 2 +- MP/code/cgame/cg_servercmds.c | 71 +-- MP/code/cgame/cg_snapshot.c | 13 +- MP/code/cgame/cg_view.c | 23 +- MP/code/cgame/cg_weapons.c | 32 +- MP/code/client/cl_console.c | 6 +- MP/code/client/cl_curl.c| 2 + MP/code/client/cl_keys.c| 6 +- MP/code/client/cl_main.c| 56 ++- MP/code/client/client.h | 2 + MP/code/game/ai_cast_script_actions.c | 12 +- MP/code/game/ai_chat.c | 54 +- MP/code/game/ai_cmd.c | 23 +- MP/code/game/ai_dmq3.c | 32 +- MP/code/game/ai_main.c | 10 +- MP/code/game/ai_team.c | 22 +- MP/code/game/bg_animation.c | 64 +-- MP/code/game/bg_slidemove.c | 27 +- MP/code/game/g_active.c | 7 +- MP/code/game/g_bot.c| 221 + MP/code/game/g_client.c | 28 +- MP/code/game/g_cmds.c | 109 - MP/code/game/g_local.h | 5 +- MP/code/game/g_main.c | 12 +- MP/code/game/g_script_actions.c | 8 +- MP/code/game/g_session.c| 20 +- MP/code/game/g_svcmds.c | 4 +- MP/code/game/g_team.c | 2 +- MP/code/game/g_utils.c | 1 - MP/code/qcommon/common.c| 11 +- MP/code/qcommon/files.c | 2 +- MP/code/qcommon/huffman.c | 49 +- MP/code/qcommon/msg.c | 45 +- MP/code/qcommon/q_shared.h | 2 +- MP/code/qcommon/qcommon.h | 9 +- MP/code/qcommon/vm.c| 44 +- MP/code/qcommon/vm_armv7l.c | 28 +- MP/code/qcommon/vm_interpreted.c| 14 +- MP/code/qcommon/vm_local.h | 7 +- MP/code/qcommon/vm_x86.c| 8 +- MP/code/rend2/glsl/bokeh_fp.glsl| 18 +- MP/code/rend2/glsl/depthblur_fp.glsl| 8 +- MP/code/rend2/glsl/dlight_fp.glsl | 22 +- MP/code/rend2/glsl/generic_fp.glsl | 23 +- MP/code/rend2/glsl/lightall_fp.glsl | 21 +- MP/code/rend2/glsl/pshadow_fp.glsl | 44 +- MP/code/rend2/glsl/shadowmask_fp.glsl | 28 +- MP/code/rend2/glsl/ssao_fp.glsl | 15 + MP/code/rend2/qgl.h | 133 ++--- MP/code/rend2/tr_animation.c| 15 +- MP/code/rend2/tr_backend.c | 353 +++--- MP/code/rend2/tr_dsa.c | 46 +- MP/code/rend2/tr_extensions.c | 185 --- MP/code/rend2/tr_fbo.c | 128 +++-- MP/code/rend2/tr_glsl.c | 28 +- MP/code/rend2/tr_image.c| 56 ++- MP/code/rend2/tr_init.c | 38 +- MP/code/rend2/tr_light.c| 1 - MP/code/rend2/tr_local.h| 95 ++-- MP/code/rend2/tr_main.c | 4 +- MP/code/rend2/tr_mesh.c | 35 +- MP/code/rend2/tr_model_iqm.c| 7 +- MP/code/r
[iortcw] 04/09: Declare compliance with Debian Policy 4.0.1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit e5d0e53d1bb58ca5f163bd8e942592c39e13c648 Author: Simon McVittie Date: Thu Aug 31 23:10:35 2017 +0100 Declare compliance with Debian Policy 4.0.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95e9b5c..24376b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ iortcw (1.51b+dfsg1-1) UNRELEASED; urgency=medium * New upstream release - Drop patch from previous version, now upstream + * Declare compliance with Debian Policy 4.0.1 -- Simon McVittie Thu, 31 Aug 2017 23:09:20 +0100 diff --git a/debian/control b/debian/control index 5693636..605a8bb 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libopusfile-dev, libsdl2-dev (>= 2.0.0), libvorbis-dev, -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Vcs-Git: https://anonscm.debian.org/git/pkg-games/iortcw.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/iortcw.git Homepage: https://github.com/iortcw/iortcw/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 06/09: d/watch: Mangle version number so the trailing "b" is not considered to be less than +dfsg
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository iortcw.
commit c9e5e355fb4a5b2632c9878968521050ea14c4a6
Author: Simon McVittie
Date: Fri Sep 8 11:15:44 2017 +0100
d/watch: Mangle version number so the trailing "b" is not considered to be
less than +dfsg
---
debian/changelog | 4 +++-
debian/rules | 4 ++--
debian/watch | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9cfd060..167a87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-iortcw (1.51b+dfsg1-1) UNRELEASED; urgency=medium
+iortcw (1.51.b+dfsg1-1) UNRELEASED; urgency=medium
* New upstream release
- Drop patch from previous version, now upstream
* Declare compliance with Debian Policy 4.1.0
+ * d/watch: Mangle version number so the trailing "b" is not considered
+to be less than +dfsg
-- Simon McVittie Thu, 31 Aug 2017 23:09:20 +0100
diff --git a/debian/rules b/debian/rules
index 3a47681..c2885ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,8 +125,8 @@ maintainer-update-icons: \
ORIG_SOURCE = iortcw
ORIG_REPO ?= https://github.com/iortcw/iortcw
-ORIG_REL = 1.51b
-ORIG_REV = $(ORIG_REL)
+ORIG_REL = 1.51.b
+ORIG_REV = 1.51b
ORIG_DATE =
ORIG_SUFFIX = +dfsg1
diff --git a/debian/watch b/debian/watch
index 5f02e67..9fa791a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=4
-opts="filenamemangle=s/.+\/(\d\S*)\.tar\.gz/iortcw-$1\.tar\.gz/,uversionmangle=s/^(\d+\.\d)([a-z])$/${1}0${2}/,dversionmangle=s/(\+[0-9]{8})?\+dfsg[0-9]+$//"
\
+opts="filenamemangle=s/.+\/(\d\S*)\.tar\.gz/iortcw-$1\.tar\.gz/,uversionmangle=s/^(\d+\.\d)([a-z])$/${1}0${2}/;s/^([0-9.]+)([a-z])$/${1}.${2}/,dversionmangle=s/(\+[0-9]{8})?\+dfsg[0-9]+$//"
\
https://github.com/iortcw/iortcw/tags .*/(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 07/09: New upstream version 1.51.b+dfsg1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit f682b67275040716f4d940fd5e6456d6eb14e865 Author: Simon McVittie Date: Fri Sep 8 11:17:34 2017 +0100 New upstream version 1.51.b+dfsg1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 05/09: Declare compliance with Debian Policy 4.1.0
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit 4bcc7f099306f4e0a50f38d3a1556c6b38038ecc Author: Simon McVittie Date: Thu Aug 31 23:11:37 2017 +0100 Declare compliance with Debian Policy 4.1.0 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 24376b6..9cfd060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ iortcw (1.51b+dfsg1-1) UNRELEASED; urgency=medium * New upstream release - Drop patch from previous version, now upstream - * Declare compliance with Debian Policy 4.0.1 + * Declare compliance with Debian Policy 4.1.0 -- Simon McVittie Thu, 31 Aug 2017 23:09:20 +0100 diff --git a/debian/control b/debian/control index 605a8bb..740a1fb 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libopusfile-dev, libsdl2-dev (>= 2.0.0), libvorbis-dev, -Standards-Version: 4.0.1 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-games/iortcw.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/iortcw.git Homepage: https://github.com/iortcw/iortcw/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 08/09: Updated version 1.51.b+dfsg1 from 'upstream/1.51.b+dfsg1'
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit 64400593e0197fb62b438b553e3502a5a6728225 Merge: c9e5e35 f682b67 Author: Simon McVittie Date: Fri Sep 8 11:17:46 2017 +0100 Updated version 1.51.b+dfsg1 from 'upstream/1.51.b+dfsg1' with Debian dir 7564083cee3a24549be471acd1cad114a6905294 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] branch debian/stretch updated (74bc5c2 -> a8196d3)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian/stretch in repository iortcw. from 74bc5c2 1.50a+dfsg1-3 new a8196d3 Fix a read buffer overflow in MSG_ReadBits (CVE-2017-11721) 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 | 8 + ...upport-for-downloading-executable-updates.patch | 2 +- ...buffer-overflow-in-MSG_ReadBits-MSG_Write.patch | 626 + debian/patches/series | 1 + 4 files changed, 636 insertions(+), 1 deletion(-) create mode 100644 debian/patches/security/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 09/09: 1.51.b+dfsg1-1
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw. commit a90dc938d418d4526b3c8f186ece5b001fe7ebe4 Author: Simon McVittie Date: Fri Sep 8 11:18:24 2017 +0100 1.51.b+dfsg1-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 167a87b..6a5e538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -iortcw (1.51.b+dfsg1-1) UNRELEASED; urgency=medium +iortcw (1.51.b+dfsg1-1) unstable; urgency=medium * New upstream release - Drop patch from previous version, now upstream @@ -6,7 +6,7 @@ iortcw (1.51.b+dfsg1-1) UNRELEASED; urgency=medium * d/watch: Mangle version number so the trailing "b" is not considered to be less than +dfsg - -- Simon McVittie Thu, 31 Aug 2017 23:09:20 +0100 + -- Simon McVittie Fri, 08 Sep 2017 11:18:04 +0100 iortcw (1.51+dfsg1-3) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 01/01: Fix a read buffer overflow in MSG_ReadBits (CVE-2017-11721)
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/stretch
in repository iortcw.
commit a8196d392a2d7b1e6fc6cd731fac843e21a79cf3
Author: Simon McVittie
Date: Tue Aug 8 09:50:11 2017 -0400
Fix a read buffer overflow in MSG_ReadBits (CVE-2017-11721)
---
debian/changelog | 8 +
...upport-for-downloading-executable-updates.patch | 2 +-
...buffer-overflow-in-MSG_ReadBits-MSG_Write.patch | 626 +
debian/patches/series | 1 +
4 files changed, 636 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index fd1f9c2..92409e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+iortcw (1.50a+dfsg1-3+deb9u1) stretch-security; urgency=medium
+
+ *
d/p/security/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch:
+Add patch (from ioquake3 via upstream) to fix a read buffer overflow
+in MSG_ReadBits (CVE-2017-11721)
+
+ -- Simon McVittie Tue, 08 Aug 2017 14:57:52 -0400
+
iortcw (1.50a+dfsg1-3) unstable; urgency=high
* d/gbp.conf: switch branch to debian/stretch for updates during freeze
diff --git
a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
index a76ef3f..08b2190 100644
---
a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
+++
b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
@@ -219,7 +219,7 @@ index 28a2f5a..e5298b6 100644
// DHM - Nerve
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
-index 1f23d0f..b1fff59 100644
+index 02ef8e8..96a9081 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
@@ -1258,12 +1258,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit
);// NERVE - S
diff --git
a/debian/patches/security/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
b/debian/patches/security/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
new file mode 100644
index 000..d7771ca
--- /dev/null
+++
b/debian/patches/security/All-Fix-improve-buffer-overflow-in-MSG_ReadBits-MSG_Write.patch
@@ -0,0 +1,626 @@
+From: MAN-AT-ARMS
+Date: Thu, 3 Aug 2017 00:06:37 -0400
+Subject: All: Fix/improve buffer overflow in MSG_ReadBits/MSG_WriteBits
+
+Origin: upstream, commit:260c39a29af517a08b3ee1a0e78ad654bdd70934
+Bug-CVE: CVE-2017-11721
+Bug-Debian: https://bugs.debian.org/870811
+---
+ MP/code/qcommon/huffman.c | 49 ---
+ MP/code/qcommon/msg.c | 45 +---
+ MP/code/qcommon/qcommon.h | 6 ++---
+ SP/code/qcommon/huffman.c | 49 ---
+ SP/code/qcommon/msg.c | 65 ++-
+ SP/code/qcommon/qcommon.h | 6 ++---
+ 6 files changed, 145 insertions(+), 75 deletions(-)
+
+diff --git a/MP/code/qcommon/huffman.c b/MP/code/qcommon/huffman.c
+index 00b007e..88b972c 100644
+--- a/MP/code/qcommon/huffman.c
b/MP/code/qcommon/huffman.c
+@@ -36,7 +36,7 @@ If you have questions concerning this license or the
applicable additional terms
+
+ static int bloc = 0;
+
+-voidHuff_putBit( int bit, byte *fout, int *offset ) {
++void Huff_putBit( int bit, byte *fout, int *offset ) {
+ bloc = *offset;
+ if ( ( bloc & 7 ) == 0 ) {
+ fout[( bloc >> 3 )] = 0;
+@@ -46,17 +46,15 @@ voidHuff_putBit( int bit, byte *fout, int *offset ) {
+ *offset = bloc;
+ }
+
+-int Huff_getBloc(void)
+-{
++int Huff_getBloc( void ) {
+ return bloc;
+ }
+
+-void Huff_setBloc(int _bloc)
+-{
++void Huff_setBloc( int _bloc ) {
+ bloc = _bloc;
+ }
+
+-int Huff_getBit( byte *fin, int *offset ) {
++int Huff_getBit( byte *fin, int *offset ) {
+ int t;
+ bloc = *offset;
+ t = ( fin[( bloc >> 3 )] >> ( bloc & 7 ) ) & 0x1;
+@@ -286,9 +284,14 @@ int Huff_Receive( node_t *node, int *ch, byte *fin ) {
+ }
+
+ /* Get a symbol */
+-void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset ) {
++void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset, int
maxoffset ) {
+ bloc = *offset;
+ while ( node && node->symbol == INTERNAL_NODE ) {
++ if ( bloc >= maxoffset ) {
++ *ch = 0;
++ *offset = maxoffset + 1;
++ return;
++ }
+ if ( get_bit( fin ) ) {
+ node = node->right;
+ } else {
+@@ -305,11 +308,15 @@ void Huff_offsetReceive( node_t *node, int *ch, byte
*fin, int *offset ) {
+ }
+
+ /* Send the prefix code for this node */
+-static void send( node_t *node, node_t *child, byte *fout ) {
++static void send( node_t *node, node_t *child, byte *fout, int maxoffset ) {
+ if ( node->parent ) {
+-
[iortcw] branch upstream/latest updated (2b5dc27 -> f682b67)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch upstream/latest in repository iortcw. from 2b5dc27 New upstream version 1.51+dfsg1 new 4f046ac New upstream version 1.51b+dfsg1 new f682b67 New upstream version 1.51.b+dfsg1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: MP/HOWTO-Build.txt => HOWTO-Build.txt | 0 MP/Makefile | 4 +- MP/README | 732 MP/code/botlib/be_aas_main.c| 2 +- MP/code/botlib/be_aas_move.c| 2 +- MP/code/botlib/be_ai_chat.c | 8 +- MP/code/botlib/be_ai_goal.c | 4 +- MP/code/botlib/be_ai_weap.c | 2 +- MP/code/botlib/be_ea.c | 1 - MP/code/botlib/be_interface.c | 4 +- MP/code/botlib/botlib.h | 4 +- MP/code/botlib/l_libvar.c | 22 +- MP/code/botlib/l_libvar.h | 18 +- MP/code/botlib/l_log.c | 2 +- MP/code/botlib/l_precomp.c | 2 +- MP/code/botlib/l_script.c | 2 +- MP/code/botlib/l_struct.c | 2 +- MP/code/cgame/cg_drawtools.c| 2 +- MP/code/cgame/cg_info.c | 2 +- MP/code/cgame/cg_main.c | 4 +- MP/code/cgame/cg_newdraw.c | 11 +- MP/code/cgame/cg_particles.c| 4 - MP/code/cgame/cg_players.c | 2 +- MP/code/cgame/cg_servercmds.c | 71 +-- MP/code/cgame/cg_snapshot.c | 13 +- MP/code/cgame/cg_view.c | 23 +- MP/code/cgame/cg_weapons.c | 32 +- MP/code/client/cl_console.c | 6 +- MP/code/client/cl_curl.c| 2 + MP/code/client/cl_keys.c| 6 +- MP/code/client/cl_main.c| 56 ++- MP/code/client/client.h | 2 + MP/code/game/ai_cast_script_actions.c | 12 +- MP/code/game/ai_chat.c | 54 +- MP/code/game/ai_cmd.c | 23 +- MP/code/game/ai_dmq3.c | 32 +- MP/code/game/ai_main.c | 10 +- MP/code/game/ai_team.c | 22 +- MP/code/game/bg_animation.c | 64 +-- MP/code/game/bg_slidemove.c | 27 +- MP/code/game/g_active.c | 7 +- MP/code/game/g_bot.c| 221 + MP/code/game/g_client.c | 28 +- MP/code/game/g_cmds.c | 109 - MP/code/game/g_local.h | 5 +- MP/code/game/g_main.c | 12 +- MP/code/game/g_script_actions.c | 8 +- MP/code/game/g_session.c| 20 +- MP/code/game/g_svcmds.c | 4 +- MP/code/game/g_team.c | 2 +- MP/code/game/g_utils.c | 1 - MP/code/qcommon/common.c| 11 +- MP/code/qcommon/files.c | 2 +- MP/code/qcommon/huffman.c | 49 +- MP/code/qcommon/msg.c | 45 +- MP/code/qcommon/q_shared.h | 2 +- MP/code/qcommon/qcommon.h | 9 +- MP/code/qcommon/vm.c| 44 +- MP/code/qcommon/vm_armv7l.c | 28 +- MP/code/qcommon/vm_interpreted.c| 14 +- MP/code/qcommon/vm_local.h | 7 +- MP/code/qcommon/vm_x86.c| 8 +- MP/code/rend2/glsl/bokeh_fp.glsl| 18 +- MP/code/rend2/glsl/depthblur_fp.glsl| 8 +- MP/code/rend2/glsl/dlight_fp.glsl | 22 +- MP/code/rend2/glsl/generic_fp.glsl | 23 +- MP/code/rend2/glsl/lightall_fp.glsl | 21 +- MP/code/rend2/glsl/pshadow_fp.glsl | 44 +- MP/code/rend2/glsl/shadowmask_fp.glsl | 28 +- MP/code/rend2/glsl/ssao_fp.glsl | 15 + MP/code/rend2/qgl.h | 133 ++--- MP/code/rend2/tr_animation.c| 15 +- MP/code/rend2/tr_backend.c | 353 +++--- MP/code/rend2/tr_dsa.c | 46 +- MP/code/rend2/tr_extensions.c | 185 --- MP/code/rend2/tr_fbo.c | 128 +++-- MP/code/rend2/tr_glsl.c | 28 +- MP/code/rend2/tr_image.c| 56 ++- MP/code/rend2/tr_init.c | 38 +- MP/code/rend2/tr_light.c| 1 - MP/code/rend2/tr_local.h| 95 ++-- MP/code/rend
[iortcw] 01/02: pristine-tar data for iortcw_1.51b+dfsg1.orig.tar.xz
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch pristine-tar in repository iortcw. commit 24265ba9205f419464d6eb3f5f09ebee718e222b Author: Simon McVittie Date: Thu Aug 31 22:48:32 2017 +0100 pristine-tar data for iortcw_1.51b+dfsg1.orig.tar.xz --- iortcw_1.51b+dfsg1.orig.tar.xz.delta | Bin 0 -> 25019 bytes iortcw_1.51b+dfsg1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/iortcw_1.51b+dfsg1.orig.tar.xz.delta b/iortcw_1.51b+dfsg1.orig.tar.xz.delta new file mode 100644 index 000..facf22b Binary files /dev/null and b/iortcw_1.51b+dfsg1.orig.tar.xz.delta differ diff --git a/iortcw_1.51b+dfsg1.orig.tar.xz.id b/iortcw_1.51b+dfsg1.orig.tar.xz.id new file mode 100644 index 000..02bdee9 --- /dev/null +++ b/iortcw_1.51b+dfsg1.orig.tar.xz.id @@ -0,0 +1 @@ +076198cc46a91447de192ce58d3013707006fbd9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] annotated tag 1.42d created (now 61d5437)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag 1.42d in repository iortcw. at 61d5437 (tag) tagging bf6027c4857f1f2bc54f39f01459532bbeeebdba (commit) tagged by MAN-AT-ARMS on Sat Dec 26 09:27:07 2015 -0500 - Log - 1.42d Alexandre Detiste (1): typos: sucessfully -> successfully Donny (27): All: Rend2: Align qgl.h with OpenGL1 version Rend2: Use signed value in case value goes below 0 All: Fix buffer overflow in CL_CheckForResend All: Add mingw prefix for cygwin32 and mingw32 All: Don't use UNIX memmove with MSVC All: SIGABRT is in ANSI and POSIX.1, and SIGIOT isn't All: Use memmove instead of strcpy in Info_RemoveKey_Big (like in Info_RemoveKey) All: Fix CG_WaterLevel() checks All: Apply greyscaling to fog blocks All: Don't fog 3D crosshair sprite All: Fix Windows file list extension check All: Remove unused fpucw from snapvector.asm All: Fix ignoring last light grid point on each axis All: Backport ignoring values outside lightgrid All: Fix range checks for numBorders in CM_AddFacetBevels All: Make more vm_x86 macros use braces All: Don't segfault in FS_CreatePath when there are no path seperators All: Rend2: Remove logically dead code in R_CheckFBO All: Only unlock AL source if needed and print developer message All: Remove unused define MAC_EVENT_PUMP_MSEC All: Maybe fix old MSYS when there is an empty for loop All: Fix not swapping buffers because out of cmd buffer space All: Fix crash from reading past end of tr.refdef.drawSurfs All: Fix reserved size for swap buffer command being too small on x86_64 All: Add Ludwig Nussel's ARMv7 VM support All: Enable Freetype support by default All: Change the defaults for use of curl Donny Springer (2): SP: Add ability to use system SDL2 and OpenAL libs on OSX All: Fix copying the libraries to build dir on OSX M4N4T4RMS (4): All: Attempt to fix svn versioning on newer subversion clients All: Attempt to fix versioning on a top-level checkout All: Attempt 2 to fix versioning on a top-level checkout All: Revert r631 m4n4t4...@gmail.com (274): All: Move SDL 2.0.1 branch to trunk SP: Update the mac build scripts with new naming convention All: Bump default com_hunkmegs to 256 MP: Only touch legacy dll for pure check All: Rend2: Dont call va each frame in GLSL_VertexAttribPointers All: Fix SCR_UpdateScreen crash from VOIP MP: Fix cgame key binds staying bound while in console All: Rend2: Fix non-HDR map surface over brighting MP: Properly handle vm_* cvars / Always extract dlls from mp_bin so they can be found All: Fix flamethrower stream sound (Still missing when using vanilla MP cgame) All: Update the readme's All: Rename the SDL2 libraries so that x86 and x64 can coexist in the same directory All: Rename the included 32bit SDL2 dll All: Update the win64 SDL libs to use the new dll name (SDL264.dll) All: Make the AL version of AddLoopingSound closer to Base version All: Change to full volume for AddRealLoopingSound (not used) in AL MP: Add stub for FS_Delete (not used in MP) All: Fix stuttering in non-local looping sounds All: Fix indentation issue in Makefiles MP: Missed one line in last commit All: Remove check for Windows versions in make copyfiles MP: Use Punkbuster MD5 implementation for cl_guid / Rename autogenerated key to avoid confusion MP: Add the Punkbuster implementation of MD5 MP: Remove the console print of CD key / clean up some stuff uncrustify shifted MP: Only calculate cl_guid on startup when using Punkbuster MD5 MP: Use upper-case for Punkbuster cl_guid like vanilla client All: Don't play all 'local' sounds at full volume All: Check for buffer overflow for rail/lightning surfaces All: Update opusfile to 0.5 All: Change the OpenAL driver and device cvars to CVAR_ROM / Add the reference OpenAL dll's for windows All: Fix check for jpeg_mem_ to work with libjpeg-turbo All: Re-allow setting OpenAL input device / Fix fallback driver code All: Revert r507 MP: Set cl_guid to NO_GUID when no cdkey is present like vanilla client MP: Add ability for server to load a map-specific config on map load All: Don't restart the renderer in SV_SpawnServer All: Don't use zip target in Makefile unless BUILD_ARCHIVE define is set All: Don't clear screen during CA_LOADING and CA_PRIMED MP: Add gender specific obituaries for self kills All: When cross compiling on mingw32, make sure it finds a CC All: Add vorbis 1.3.4 support (Still disabled by default) All: Clear r
[iortcw] branch pristine-tar updated (49ac0a4 -> c8e188b)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch pristine-tar in repository iortcw. from 49ac0a4 pristine-tar data for iortcw_1.51+dfsg1.orig.tar.xz new 24265ba pristine-tar data for iortcw_1.51b+dfsg1.orig.tar.xz new c8e188b pristine-tar data for iortcw_1.51.b+dfsg1.orig.tar.xz The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: iortcw_1.51.b+dfsg1.orig.tar.xz.delta | Bin 0 -> 25232 bytes iortcw_1.51.b+dfsg1.orig.tar.xz.id| 1 + iortcw_1.51b+dfsg1.orig.tar.xz.delta | Bin 0 -> 25019 bytes iortcw_1.51b+dfsg1.orig.tar.xz.id | 1 + 4 files changed, 2 insertions(+) create mode 100644 iortcw_1.51.b+dfsg1.orig.tar.xz.delta create mode 100644 iortcw_1.51.b+dfsg1.orig.tar.xz.id create mode 100644 iortcw_1.51b+dfsg1.orig.tar.xz.delta create mode 100644 iortcw_1.51b+dfsg1.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 06/497: All: Fix SCR_UpdateScreen crash from VOIP
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 0b49c4d5c908d036a8ae3e125a0b90cd3d7df715
Author: m4n4t4...@gmail.com
Date: Wed Jan 15 03:30:19 2014 +
All: Fix SCR_UpdateScreen crash from VOIP
---
MP/code/client/cl_parse.c | 4 ++--
SP/code/client/cl_parse.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MP/code/client/cl_parse.c b/MP/code/client/cl_parse.c
index e3cc8c6..dadbaea 100644
--- a/MP/code/client/cl_parse.c
+++ b/MP/code/client/cl_parse.c
@@ -920,7 +920,7 @@ void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
// tell opus that we're missing frames...
for (i = 0; i < seqdiff; i++) {
assert((written + VOIP_MAX_PACKET_SAMPLES) * 2 < sizeof
(decoded));
- numSamples = opus_decode(clc.opusDecoder[sender], NULL,
VOIP_MAX_PACKET_SAMPLES * 2, decoded + written, sizeof (decoded) - written, 0);
+ numSamples = opus_decode(clc.opusDecoder[sender], NULL,
0, decoded + written, VOIP_MAX_PACKET_SAMPLES, 0);
if ( numSamples <= 0 ) {
Com_DPrintf("VoIP: Error decoding frame %d from
client #%d\n", i, sender);
continue;
@@ -929,7 +929,7 @@ void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
}
}
- numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize,
decoded + written, sizeof (decoded) - written, 0);
+ numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize,
decoded + written, ARRAY_LEN(decoded) - written, 0);
if ( numSamples <= 0 ) {
Com_DPrintf("VoIP: Error decoding voip data from client #%d\n",
sender);
diff --git a/SP/code/client/cl_parse.c b/SP/code/client/cl_parse.c
index fc200b2..4f28fb7 100644
--- a/SP/code/client/cl_parse.c
+++ b/SP/code/client/cl_parse.c
@@ -787,7 +787,7 @@ void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
// tell opus that we're missing frames...
for (i = 0; i < seqdiff; i++) {
assert((written + VOIP_MAX_PACKET_SAMPLES) * 2 < sizeof
(decoded));
- numSamples = opus_decode(clc.opusDecoder[sender], NULL,
VOIP_MAX_PACKET_SAMPLES * 2, decoded + written, sizeof (decoded) - written, 0);
+ numSamples = opus_decode(clc.opusDecoder[sender], NULL,
0, decoded + written, VOIP_MAX_PACKET_SAMPLES, 0);
if ( numSamples <= 0 ) {
Com_DPrintf("VoIP: Error decoding frame %d from
client #%d\n", i, sender);
continue;
@@ -796,7 +796,7 @@ void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
}
}
- numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize,
decoded + written, sizeof (decoded) - written, 0);
+ numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize,
decoded + written, ARRAY_LEN(decoded) - written, 0);
if ( numSamples <= 0 ) {
Com_DPrintf("VoIP: Error decoding voip data from client #%d\n",
sender);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 07/497: MP: Fix cgame key binds staying bound while in console
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 310fed37af3c344cb8eab9b10edc5cb7bd807fe0
Author: m4n4t4...@gmail.com
Date: Wed Jan 15 04:57:46 2014 +
MP: Fix cgame key binds staying bound while in console
---
MP/code/client/cl_keys.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MP/code/client/cl_keys.c b/MP/code/client/cl_keys.c
index abc823e..d46807a 100644
--- a/MP/code/client/cl_keys.c
+++ b/MP/code/client/cl_keys.c
@@ -2288,7 +2288,7 @@ void CL_KeyDownEvent( int key, unsigned time )
}
// NERVE - SMF - if we just want to pass it along to game
- if ( cl_bypassMouseInput && cl_bypassMouseInput->integer ) {//DAJ
BUG in dedicated cl_missionStats don't exist
+ if ( cl_bypassMouseInput && cl_bypassMouseInput->integer && !(
Key_GetCatcher( ) & KEYCATCH_CONSOLE ) ) {//DAJ BUG in dedicated
cl_missionStats don't exist
if ( ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 )
) {
if ( cl_bypassMouseInput->integer == 1 ) {
bypassMenu = qtrue;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 05/497: All: Rend2: Dont call va each frame in GLSL_VertexAttribPointers
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 9fed9499574d321ffc251c162ba7153e868e9c76
Author: m4n4t4...@gmail.com
Date: Wed Jan 15 00:21:27 2014 +
All: Rend2: Dont call va each frame in GLSL_VertexAttribPointers
---
MP/code/rend2/tr_glsl.c | 5 -
SP/code/rend2/tr_glsl.c | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index 693e443..db55c15 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -1653,7 +1653,10 @@ void GLSL_VertexAttribPointers(uint32_t attribBits)
}
// don't just call LogComment, or we will get a call to va() every
frame!
- GLimp_LogComment(va("--- GL_VertexAttribPointers( %s ) ---\n",
vbo->name));
+ if(r_logFile->integer)
+ {
+ GLimp_LogComment(va("--- GL_VertexAttribPointers( %s ) ---\n",
vbo->name));
+ }
// position/normal/tangent are always set in case of animation
oldFrame = glState.vertexAttribsOldFrame;
diff --git a/SP/code/rend2/tr_glsl.c b/SP/code/rend2/tr_glsl.c
index 693e443..db55c15 100644
--- a/SP/code/rend2/tr_glsl.c
+++ b/SP/code/rend2/tr_glsl.c
@@ -1653,7 +1653,10 @@ void GLSL_VertexAttribPointers(uint32_t attribBits)
}
// don't just call LogComment, or we will get a call to va() every
frame!
- GLimp_LogComment(va("--- GL_VertexAttribPointers( %s ) ---\n",
vbo->name));
+ if(r_logFile->integer)
+ {
+ GLimp_LogComment(va("--- GL_VertexAttribPointers( %s ) ---\n",
vbo->name));
+ }
// position/normal/tangent are always set in case of animation
oldFrame = glState.vertexAttribsOldFrame;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 09/497: MP: Properly handle vm_* cvars / Always extract dlls from mp_bin so they can be found
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 1811d3fc5630a6c000fca00e942329027eb1b7ff
Author: m4n4t4...@gmail.com
Date: Sat Jan 18 15:19:11 2014 +
MP: Properly handle vm_* cvars / Always extract dlls from mp_bin so they
can be found
---
MP/code/qcommon/files.c | 4 ++--
MP/code/qcommon/vm.c| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 217bb16..dc3dd9b 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -1574,9 +1574,9 @@ int FS_FindVM(void **startSearch, char *found, int
foundlen, const char *name, q
}
#ifndef DEDICATED
- // if the server is pure, extract the dlls from the
mp_bin.pk3 so
+ // extract the dlls from the mp_bin.pk3 so
// that they can be referenced
- if (cl_connectedToPureServer && Q_stricmp(name,
"qagame"))
+ if (Q_stricmp(name, "qagame"))
{
netpath = FS_BuildOSPath(fs_homepath->string,
pack->pakGamename, dllName);
diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index 6594598..00e0936 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -629,7 +629,7 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
do
{
- retval = FS_FindVM(&startSearch, filename, sizeof(filename),
module, !pureVM, (interpret != VMI_NATIVE));
+ retval = FS_FindVM(&startSearch, filename, sizeof(filename),
module, pureVM, (interpret != VMI_NATIVE));
if(retval == VMI_NATIVE)
{
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 12/497: All: Rename the SDL2 libraries so that x86 and x64 can coexist in the same directory
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit de879bfd7cf496f85ec083a52299b3ada5bf0979
Author: m4n4t4...@gmail.com
Date: Sun Jan 19 17:51:41 2014 +
All: Rename the SDL2 libraries so that x86 and x64 can coexist in the same
directory
---
MP/Makefile | 10 +-
MP/code/libs/win64/{libSDL2.dll => SDL264.dll}| Bin
MP/code/libs/win64/{libSDL2.dll.a => libSDL264.dll.a} | Bin
SP/Makefile | 10 +-
SP/code/libs/win64/{libSDL2.dll => SDL264.dll}| Bin
SP/code/libs/win64/{libSDL2.dll.a => libSDL264.dll.a} | Bin
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index ed72ce1..eae22a4 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -654,19 +654,19 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
$(LIBSDIR)/win32/libSDL2.dll.a
-SDLDLL=libSDL2.dll
+SDLDLL=SDL2.dll
else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
-SDLDLL=libSDL2.dll
+ $(LIBSDIR)/win64/libSDL264.dll.a
+SDLDLL=SDL264.dll
endif
else
CLIENT_CFLAGS += $(SDL_CFLAGS)
CLIENT_LIBS += $(SDL_LIBS)
RENDERER_LIBS += $(SDL_LIBS)
-SDLDLL=libSDL2.dll
+SDLDLL=SDL2.dll
endif
else # ifeq mingw32
diff --git a/MP/code/libs/win64/libSDL2.dll b/MP/code/libs/win64/SDL264.dll
similarity index 100%
rename from MP/code/libs/win64/libSDL2.dll
rename to MP/code/libs/win64/SDL264.dll
diff --git a/MP/code/libs/win64/libSDL2.dll.a
b/MP/code/libs/win64/libSDL264.dll.a
similarity index 100%
rename from MP/code/libs/win64/libSDL2.dll.a
rename to MP/code/libs/win64/libSDL264.dll.a
diff --git a/SP/Makefile b/SP/Makefile
index a55662f..a61fa92 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -667,19 +667,19 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
$(LIBSDIR)/win32/libSDL2.dll.a
-SDLDLL=libSDL2.dll
+SDLDLL=SDL2.dll
else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
-SDLDLL=libSDL2.dll
+ $(LIBSDIR)/win64/libSDL264.dll.a
+SDLDLL=SDL264.dll
endif
else
CLIENT_CFLAGS += $(SDL_CFLAGS)
CLIENT_LIBS += $(SDL_LIBS)
RENDERER_LIBS += $(SDL_LIBS)
-SDLDLL=libSDL2.dll
+SDLDLL=SDL2.dll
endif
else # ifeq mingw32
diff --git a/SP/code/libs/win64/libSDL2.dll b/SP/code/libs/win64/SDL264.dll
similarity index 100%
rename from SP/code/libs/win64/libSDL2.dll
rename to SP/code/libs/win64/SDL264.dll
diff --git a/SP/code/libs/win64/libSDL2.dll.a
b/SP/code/libs/win64/libSDL264.dll.a
similarity index 100%
rename from SP/code/libs/win64/libSDL2.dll.a
rename to SP/code/libs/win64/libSDL264.dll.a
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 11/497: All: Update the readme's
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit b65ae5d2dbc50a4841f2e43b5a466f7a89cfbcc8 Author: m4n4t4...@gmail.com Date: Sun Jan 19 16:55:30 2014 + All: Update the readme's --- MP/README | 4 ++-- MP/rend2-readme.txt | 10 +- SP/README | 4 ++-- SP/rend2-readme.txt | 10 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/MP/README b/MP/README index e495b2b..027ff21 100644 --- a/MP/README +++ b/MP/README @@ -14,7 +14,7 @@ Some of the major features currently implemented are: * SDL backend * OpenAL sound API support (multiple speaker support and better sound quality) - * Full x86_64 support on Linux + * Full x86_64 support * VoIP support, both in-game and external support through Mumble. * MinGW compilation support on Windows and cross compilation support on Linux * AVI video capture of demos @@ -444,7 +444,7 @@ SDL Keyboard Differences text. Also, in addition to the nominated console keys, Shift-ESC is hard coded to always toggle the console. -QuakeLive mouse acceleration (patch and this text written by TTimo from id) + QuakeLive mouse acceleration (patch and this text written by TTimo from id) I've been using an experimental mouse acceleration code for a while, and decided to make it available to everyone. Don't be too worried if you don't understand the explanations below, this is mostly intended for advanced diff --git a/MP/rend2-readme.txt b/MP/rend2-readme.txt index 999fd38..4e5684d 100644 --- a/MP/rend2-readme.txt +++ b/MP/rend2-readme.txt @@ -1,7 +1,7 @@ -OpenGL2 +Rend2 -OpenGL2 is an alternate renderer for ioquake3. It aims to implement modern +Rend2 is an alternate renderer for ioquake3. It aims to implement modern features and technologies into the id tech 3 engine, but without sacrificing compatibility with existing Quake 3 mods. @@ -232,7 +232,7 @@ Cvars for image interpolation and generation: 1 - Do. Cvars for the sunlight and cascaded shadow maps: - r_forceSun - Cheat. Force sunlight and shadows, using sun + r_forceSun - Force sunlight and shadows, using sun position from sky material. 0 - Don't. (default) 1 - Do. @@ -345,7 +345,7 @@ Cvars that have broken bits: MATERIALS --- -OpenGL2 supports .mtr files, which are basically the same as .shader files, and +Rend2 supports .mtr files, which are basically the same as .shader files, and are located in the same place, but override existing .shader files if they exist. This is to allow maps and mods to use the new material features without breaking the map when using the old renderer. @@ -380,7 +380,7 @@ shader files. The next thing to notice are the new keywords. Here is what they mean: stage -- State how this imagemap will be used by OpenGL2: +- State how this imagemap will be used by Rend2: diffuseMap- Standard, same as no stage entry normalMap - Image will be used as a normal map normalParallaxMap - Image will be used as a normal map with diff --git a/SP/README b/SP/README index e495b2b..027ff21 100644 --- a/SP/README +++ b/SP/README @@ -14,7 +14,7 @@ Some of the major features currently implemented are: * SDL backend * OpenAL sound API support (multiple speaker support and better sound quality) - * Full x86_64 support on Linux + * Full x86_64 support * VoIP support, both in-game and external support through Mumble. * MinGW compilation support on Windows and cross compilation support on Linux * AVI video capture of demos @@ -444,7 +444,7 @@ SDL Keyboard Differences text. Also, in addition to the nominated console keys, Shift-ESC is hard coded to always toggle the console. -QuakeLive mouse acceleration (patch and this text written by TTimo from id) + QuakeLive mouse acceleration (patch and this text written by TTimo from id) I've been using an experimental mouse acceleration code for a while, and decided to make it available to everyone. Don't be too worried if you don't understand the explanations below, this is mostly intended for advanced diff --git a/SP/rend2-readme.txt b/SP/rend2-readme.txt index 999fd38..4e5684d 100644 --- a/SP/rend2-readme.txt +++ b/SP/rend2-readme.txt @@ -1,7 +1,7 @@ -OpenGL2 +Rend2 -OpenGL2 is an alternate renderer for ioquake3. It aims to implement modern +Rend2 is an alternate renderer for ioquake3. It aims to implement modern features and technologies into the id tech 3 engine, but without sacrificing compatibility with existing Quake 3 mods. @@ -232,7 +232,7 @@ Cvars for image interpolation and generation:
[iortcw] 02/02: pristine-tar data for iortcw_1.51.b+dfsg1.orig.tar.xz
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch pristine-tar in repository iortcw. commit c8e188b5cde683c78b263845efae4c74b31a765a Author: Simon McVittie Date: Fri Sep 8 11:17:46 2017 +0100 pristine-tar data for iortcw_1.51.b+dfsg1.orig.tar.xz --- iortcw_1.51.b+dfsg1.orig.tar.xz.delta | Bin 0 -> 25232 bytes iortcw_1.51.b+dfsg1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/iortcw_1.51.b+dfsg1.orig.tar.xz.delta b/iortcw_1.51.b+dfsg1.orig.tar.xz.delta new file mode 100644 index 000..475ad22 Binary files /dev/null and b/iortcw_1.51.b+dfsg1.orig.tar.xz.delta differ diff --git a/iortcw_1.51.b+dfsg1.orig.tar.xz.id b/iortcw_1.51.b+dfsg1.orig.tar.xz.id new file mode 100644 index 000..02bdee9 --- /dev/null +++ b/iortcw_1.51.b+dfsg1.orig.tar.xz.id @@ -0,0 +1 @@ +076198cc46a91447de192ce58d3013707006fbd9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 13/497: All: Rename the included 32bit SDL2 dll
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 830a2cba1ab49d0e3c8cd0e0248ff95c50a94d77
Author: m4n4t4...@gmail.com
Date: Sun Jan 19 17:56:53 2014 +
All: Rename the included 32bit SDL2 dll
---
MP/code/libs/win32/{libSDL2.dll => SDL2.dll} | Bin
SP/code/libs/win32/{libSDL2.dll => SDL2.dll} | Bin
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/MP/code/libs/win32/libSDL2.dll b/MP/code/libs/win32/SDL2.dll
similarity index 100%
rename from MP/code/libs/win32/libSDL2.dll
rename to MP/code/libs/win32/SDL2.dll
diff --git a/SP/code/libs/win32/libSDL2.dll b/SP/code/libs/win32/SDL2.dll
similarity index 100%
rename from SP/code/libs/win32/libSDL2.dll
rename to SP/code/libs/win32/SDL2.dll
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 04/497: MP: Only touch legacy dll for pure check
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 62fadc477a4e58616302034a75edca20aa053b23
Author: m4n4t4...@gmail.com
Date: Tue Jan 14 23:49:36 2014 +
MP: Only touch legacy dll for pure check
---
MP/code/server/sv_client.c | 7 ---
MP/code/server/sv_init.c | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/MP/code/server/sv_client.c b/MP/code/server/sv_client.c
index c88fd19..259b92a 100644
--- a/MP/code/server/sv_client.c
+++ b/MP/code/server/sv_client.c
@@ -1273,9 +1273,10 @@ static void SV_VerifyPaks_f( client_t *cl ) {
nChkSum1 = nChkSum2 = 0;
- bGood = ( FS_FileIsInPAK( Sys_GetDLLName( "cgame" ), &nChkSum1
) == 1) ;
+ // Only check the legacy dll for legacy clients
+ bGood = ( FS_FileIsInPAK( "cgame_mp_x86.dll", &nChkSum1 ) == 1)
;
if ( bGood ) {
- bGood = ( FS_FileIsInPAK( Sys_GetDLLName( "ui" ),
&nChkSum2 ) == 1) ;
+ bGood = ( FS_FileIsInPAK( "ui_mp_x86.dll", &nChkSum2 )
== 1) ;
}
bQvmGood = ( FS_FileIsInPAK( "vm/cgame.mp.qvm", &nChkSumQvm1 )
== 1) ;
@@ -1320,7 +1321,7 @@ static void SV_VerifyPaks_f( client_t *cl ) {
}
// verify the second to be the ui checksum
pArg = Cmd_Argv( nCurArg++ );
- if ( !pArg || *pArg == '@' || ( atoi( pArg ) !=
nChkSum1 && ( !bQvmGood || atoi( pArg ) != nChkSumQvm2 ) ) ) {
+ if ( !pArg || *pArg == '@' || ( atoi( pArg ) !=
nChkSum2 && ( !bQvmGood || atoi( pArg ) != nChkSumQvm2 ) ) ) {
bGood = qfalse;
break;
}
diff --git a/MP/code/server/sv_init.c b/MP/code/server/sv_init.c
index c41ef77..9264ed3 100644
--- a/MP/code/server/sv_init.c
+++ b/MP/code/server/sv_init.c
@@ -473,7 +473,7 @@ static void SV_TouchCGame( void ) {
fileHandle_t f;
char filename[MAX_QPATH];
- Com_sprintf( filename, sizeof( filename ), "vm/%s.qvm", "cgame" );
+ Com_sprintf( filename, sizeof( filename ), "vm/%s.mp.qvm", "cgame" );
FS_FOpenFileRead( filename, &f, qfalse );
if ( f ) {
FS_FCloseFile( f );
@@ -491,7 +491,8 @@ void SV_TouchCGameDLL( void ) {
fileHandle_t f;
char *filename;
- filename = Sys_GetDLLName( "cgame" );
+ // Only touch the legacy dll since we have qvm support
+ filename = "cgame_mp_x86.dll";
FS_FOpenFileRead_Filtered( filename, &f, qfalse, FS_EXCLUDE_DIR );
if ( f ) {
FS_FCloseFile( f );
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 03/497: All: Bump default com_hunkmegs to 256
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 81d3a4df7095f6f132a284410a7981384117648a Author: m4n4t4...@gmail.com Date: Tue Jan 14 12:37:15 2014 + All: Bump default com_hunkmegs to 256 --- MP/code/qcommon/common.c | 4 ++-- SP/code/qcommon/common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP/code/qcommon/common.c b/MP/code/qcommon/common.c index 18a0a89..b037706 100644 --- a/MP/code/qcommon/common.c +++ b/MP/code/qcommon/common.c @@ -44,8 +44,8 @@ int demo_protocols[] = #define MAX_NUM_ARGVS 50 #define MIN_DEDICATED_COMHUNKMEGS 1 -#define MIN_COMHUNKMEGS 64 // JPW NERVE changed this to 42 for MP, was 56 for team arena and 75 for wolfSP -#define DEF_COMHUNKMEGS 128 // RF, increased this, some maps are exceeding 56mb // JPW NERVE changed this for multiplayer back to 42, 56 for depot/mp_cpdepot, 42 for everything else +#define MIN_COMHUNKMEGS 128 // JPW NERVE changed this to 42 for MP, was 56 for team arena and 75 for wolfSP +#define DEF_COMHUNKMEGS 256 // RF, increased this, some maps are exceeding 56mb // JPW NERVE changed this for multiplayer back to 42, 56 for depot/mp_cpdepot, 42 for everything else #define DEF_COMZONEMEGS 32 // JPW NERVE cut this back too was 30 #define DEF_COMHUNKMEGS_S XSTRING(DEF_COMHUNKMEGS) #define DEF_COMZONEMEGS_S XSTRING(DEF_COMZONEMEGS) diff --git a/SP/code/qcommon/common.c b/SP/code/qcommon/common.c index e6314c9..8f556e9 100644 --- a/SP/code/qcommon/common.c +++ b/SP/code/qcommon/common.c @@ -46,8 +46,8 @@ int demo_protocols[] = #define MAX_NUM_ARGVS 50 #define MIN_DEDICATED_COMHUNKMEGS 1 -#define MIN_COMHUNKMEGS64 -#define DEF_COMHUNKMEGS128 +#define MIN_COMHUNKMEGS128 +#define DEF_COMHUNKMEGS256 #define DEF_COMZONEMEGS32 #define DEF_COMHUNKMEGS_S XSTRING(DEF_COMHUNKMEGS) #define DEF_COMZONEMEGS_S XSTRING(DEF_COMZONEMEGS) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 10/497: All: Fix flamethrower stream sound (Still missing when using vanilla MP cgame)
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 2254bc643771aecc5a6df30a45a69b5addc54f7a
Author: m4n4t4...@gmail.com
Date: Sun Jan 19 12:43:19 2014 +
All: Fix flamethrower stream sound (Still missing when using vanilla MP
cgame)
---
MP/code/cgame/cg_flamethrower.c | 12 ++--
SP/code/cgame/cg_flamethrower.c | 13 +
2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/MP/code/cgame/cg_flamethrower.c b/MP/code/cgame/cg_flamethrower.c
index 482ecae..cc8fa7f 100644
--- a/MP/code/cgame/cg_flamethrower.c
+++ b/MP/code/cgame/cg_flamethrower.c
@@ -1360,7 +1360,7 @@ CG_UpdateFlamethrowerSounds
===
*/
void CG_UpdateFlamethrowerSounds( void ) {
- flameChunk_t *f, *trav; // , *lastSoundFlameChunk=NULL; // TTimo: unused
+ flameChunk_t *f; //, *trav; // , *lastSoundFlameChunk=NULL; // TTimo:
unused
#define MIN_BLOW_VOLUME 30
// draw each of the headFlameChunk's
@@ -1387,12 +1387,12 @@ void CG_UpdateFlamethrowerSounds( void ) {
}
// traverse the chunks, spawning flame sound sources as we go
- for ( trav = f; trav; trav = trav->nextFlameChunk ) {
+// for ( trav = f; trav; trav = trav->nextFlameChunk ) {
// update the sound volume
- if ( trav->blueLife + 100 < ( cg.time - trav->timeStart
) ) {
- CG_S_AddLoopingSound( trav->ownerCent,
trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * (
trav->size / FLAME_MAX_SIZE ) ) ) );
- }
- }
+// if ( trav->blueLife + 100 < ( cg.time - trav->timeStart
) ) {
+// CG_S_AddLoopingSound( trav->ownerCent,
trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * (
trav->size / FLAME_MAX_SIZE ) ) ) );
+// }
+// }
f = f->nextHead;
}
diff --git a/SP/code/cgame/cg_flamethrower.c b/SP/code/cgame/cg_flamethrower.c
index 46aa688..8f445d3 100644
--- a/SP/code/cgame/cg_flamethrower.c
+++ b/SP/code/cgame/cg_flamethrower.c
@@ -1539,7 +1539,7 @@ CG_UpdateFlamethrowerSounds
===
*/
void CG_UpdateFlamethrowerSounds( void ) {
- flameChunk_t *f, *trav;
+ flameChunk_t *f;
//flameChunk_t *lastSoundFlameChunk=NULL; // TTimo: unused
int i;
centity_t *cent;
@@ -1574,17 +1574,6 @@ void CG_UpdateFlamethrowerSounds( void ) {
centFlameInfo[f->ownerCent].lastSoundUpdate = cg.time;
}
- // traverse the chunks, spawning flame sound sources as we go
- for ( trav = f; trav; trav = trav->nextFlameChunk ) {
- // update the sound volume
- if ( trav->blueLife + 100 < ( cg.time - trav->timeStart
) ) {
- //if (!lastSoundFlameChunk || Distance(
lastSoundFlameChunk->org, trav->org ) > lastSoundFlameChunk->size) {
- CG_S_AddLoopingSound( trav->ownerCent,
trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * (
trav->size / FLAME_MAX_SIZE ) ) ) );
- // lastSoundFlameChunk = trav;
- //}
- }
- }
-
f = f->nextHead;
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 02/497: SP: Update the mac build scripts with new naming convention
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 85a8f78f108a077d0b1d8ee8794274589a4f97db
Author: m4n4t4...@gmail.com
Date: Tue Jan 14 02:43:05 2014 +
SP: Update the mac build scripts with new naming convention
---
SP/make-macosx-ub.sh | 18 +-
SP/make-macosx_xcode3.sh | 6 +++---
SP/make-macosx_xcode4.sh | 6 +++---
SP/make-macosx_xcode5.sh | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/SP/make-macosx-ub.sh b/SP/make-macosx-ub.sh
index 60ed909..47be405 100755
--- a/SP/make-macosx-ub.sh
+++ b/SP/make-macosx-ub.sh
@@ -13,15 +13,15 @@ BIN_OBJ="
build/release-darwin-ppc/iowolfsp.ppc
"
BASE_OBJ="
- build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib
- build/release-darwin-x86/$BASEDIR/cgamei386.dylib
- build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
- build/release-darwin-x86_64/$BASEDIR/uix86_64.dylib
- build/release-darwin-x86/$BASEDIR/uii386.dylib
- build/release-darwin-ppc/$BASEDIR/uippc.dylib
- build/release-darwin-x86_64/$BASEDIR/qagamex86_64.dylib
- build/release-darwin-x86/$BASEDIR/qagamei386.dylib
- build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
+ build/release-darwin-x86_64/$BASEDIR/cgame.sp.x86_64.dylib
+ build/release-darwin-x86/$BASEDIR/cgame.sp.i386.dylib
+ build/release-darwin-ppc/$BASEDIR/cgame.sp.ppc.dylib
+ build/release-darwin-x86_64/$BASEDIR/ui.sp.x86_64.dylib
+ build/release-darwin-x86/$BASEDIR/ui.sp.i386.dylib
+ build/release-darwin-ppc/$BASEDIR/ui.sp.ppc.dylib
+ build/release-darwin-x86_64/$BASEDIR/qagame.sp.x86_64.dylib
+ build/release-darwin-x86/$BASEDIR/qagame.sp.i386.dylib
+ build/release-darwin-ppc/$BASEDIR/qagame.sp.ppc.dylib
"
RENDER_OBJ="
build/release-darwin-x86_64/renderer_sp_opengl1_x86_64.dylib
diff --git a/SP/make-macosx_xcode3.sh b/SP/make-macosx_xcode3.sh
index f9eb73c..abd7fd5 100755
--- a/SP/make-macosx_xcode3.sh
+++ b/SP/make-macosx_xcode3.sh
@@ -40,9 +40,9 @@ BIN_OBJ="
build/release-darwin-${BUILDARCH}/iowolfsp.${BUILDARCH}
"
BASE_OBJ="
- build/release-darwin-${BUILDARCH}/$BASEDIR/cgame${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/ui${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/qagame${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/cgame.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/ui.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/qagame.sp.${ARCH}.dylib
"
RENDER_OBJ="
build/release-darwin-${BUILDARCH}/renderer_sp_opengl1_${ARCH}.dylib
diff --git a/SP/make-macosx_xcode4.sh b/SP/make-macosx_xcode4.sh
index 6f9577c..73991c5 100755
--- a/SP/make-macosx_xcode4.sh
+++ b/SP/make-macosx_xcode4.sh
@@ -37,9 +37,9 @@ BIN_OBJ="
build/release-darwin-${BUILDARCH}/iowolfsp.${BUILDARCH}
"
BASE_OBJ="
- build/release-darwin-${BUILDARCH}/$BASEDIR/cgame${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/ui${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/qagame${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/cgame.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/ui.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/qagame.sp.${ARCH}.dylib
"
RENDER_OBJ="
build/release-darwin-${BUILDARCH}/renderer_sp_opengl1_${ARCH}.dylib
diff --git a/SP/make-macosx_xcode5.sh b/SP/make-macosx_xcode5.sh
index e9668e3..006604c 100755
--- a/SP/make-macosx_xcode5.sh
+++ b/SP/make-macosx_xcode5.sh
@@ -37,9 +37,9 @@ BIN_OBJ="
build/release-darwin-${BUILDARCH}/iowolfsp.${BUILDARCH}
"
BASE_OBJ="
- build/release-darwin-${BUILDARCH}/$BASEDIR/cgame${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/ui${ARCH}.dylib
- build/release-darwin-${BUILDARCH}/$BASEDIR/qagame${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/cgame.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/ui.sp.${ARCH}.dylib
+ build/release-darwin-${BUILDARCH}/$BASEDIR/qagame.sp.${ARCH}.dylib
"
RENDER_OBJ="
build/release-darwin-${BUILDARCH}/renderer_sp_opengl1_${ARCH}.dylib
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 08/497: All: Rend2: Fix non-HDR map surface over brighting
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 5eeab8da3ad8a31c58566268bf7db4d48d0b155a
Author: m4n4t4...@gmail.com
Date: Thu Jan 16 11:30:15 2014 +
All: Rend2: Fix non-HDR map surface over brighting
---
MP/code/rend2/tr_bsp.c | 25 +
SP/code/rend2/tr_bsp.c | 25 +
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/MP/code/rend2/tr_bsp.c b/MP/code/rend2/tr_bsp.c
index af03baa..01b0584 100644
--- a/MP/code/rend2/tr_bsp.c
+++ b/MP/code/rend2/tr_bsp.c
@@ -133,17 +133,34 @@ static void R_ColorShiftLightingBytes( byte in[4], byte
out[4] ) {
/*
===
-R_ColorShiftLightingBytes
+R_ColorShiftLightingFloats
===
*/
static void R_ColorShiftLightingFloats(float in[4], float out[4], float scale )
{
+ float r, g, b;
+
scale *= pow(2.0f, r_mapOverBrightBits->integer - tr.overbrightBits);
- out[0] = in[0] * scale;
- out[1] = in[1] * scale;
- out[2] = in[2] * scale;
+ r = in[0] * scale;
+ g = in[1] * scale;
+ b = in[2] * scale;
+
+ // normalize by color instead of saturating to white
+ if ( !r_hdr->integer && ( r > 1 || g > 1 || b > 1 ) ) {
+ float max;
+
+ max = r > g ? r : g;
+ max = max > b ? max : b;
+ r = r / max;
+ g = g / max;
+ b = b / max;
+ }
+
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
out[3] = in[3];
}
diff --git a/SP/code/rend2/tr_bsp.c b/SP/code/rend2/tr_bsp.c
index 6ee51f0..15edfa6 100644
--- a/SP/code/rend2/tr_bsp.c
+++ b/SP/code/rend2/tr_bsp.c
@@ -133,17 +133,34 @@ static void R_ColorShiftLightingBytes( byte in[4], byte
out[4] ) {
/*
===
-R_ColorShiftLightingBytes
+R_ColorShiftLightingFloats
===
*/
static void R_ColorShiftLightingFloats(float in[4], float out[4], float scale )
{
+ float r, g, b;
+
scale *= pow(2.0f, r_mapOverBrightBits->integer - tr.overbrightBits);
- out[0] = in[0] * scale;
- out[1] = in[1] * scale;
- out[2] = in[2] * scale;
+ r = in[0] * scale;
+ g = in[1] * scale;
+ b = in[2] * scale;
+
+ // normalize by color instead of saturating to white
+ if ( !r_hdr->integer && ( r > 1 || g > 1 || b > 1 ) ) {
+ float max;
+
+ max = r > g ? r : g;
+ max = max > b ? max : b;
+ r = r / max;
+ g = g / max;
+ b = b / max;
+ }
+
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
out[3] = in[3];
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 14/497: All: Update the win64 SDL libs to use the new dll name (SDL264.dll)
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 2f46cb4d9ce3553351d063feb39236127de9473c
Author: m4n4t4...@gmail.com
Date: Sun Jan 19 19:13:56 2014 +
All: Update the win64 SDL libs to use the new dll name (SDL264.dll)
---
MP/Makefile| 4 ++--
MP/code/libs/win64/SDL264.dll | Bin 4899709 -> 4899709
bytes
MP/code/libs/win64/{libSDL2.a => libSDL264.a} | Bin 5526812 -> 5526812
bytes
MP/code/libs/win64/libSDL264.dll.a | Bin 325694 -> 326740 bytes
.../libs/win64/{libSDL2main.a => libSDL264main.a} | Bin 8190 -> 8190 bytes
SP/Makefile| 4 ++--
SP/code/libs/win64/SDL264.dll | Bin 4899709 -> 4899709
bytes
SP/code/libs/win64/{libSDL2.a => libSDL264.a} | Bin 5526812 -> 5526812
bytes
SP/code/libs/win64/libSDL264.dll.a | Bin 325694 -> 326740 bytes
.../libs/win64/{libSDL2main.a => libSDL264main.a} | Bin 8190 -> 8190 bytes
10 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index eae22a4..7d78265 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -656,9 +656,9 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
SDLDLL=SDL2.dll
else
-CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
+CLIENT_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
$(LIBSDIR)/win64/libSDL264.dll.a
-RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
+RENDERER_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
$(LIBSDIR)/win64/libSDL264.dll.a
SDLDLL=SDL264.dll
endif
diff --git a/MP/code/libs/win64/SDL264.dll b/MP/code/libs/win64/SDL264.dll
index 47bff8b..30d7f9b 100755
Binary files a/MP/code/libs/win64/SDL264.dll and
b/MP/code/libs/win64/SDL264.dll differ
diff --git a/MP/code/libs/win64/libSDL2.a b/MP/code/libs/win64/libSDL264.a
similarity index 99%
rename from MP/code/libs/win64/libSDL2.a
rename to MP/code/libs/win64/libSDL264.a
index a1db77c..0bfc7c3 100644
Binary files a/MP/code/libs/win64/libSDL2.a and
b/MP/code/libs/win64/libSDL264.a differ
diff --git a/MP/code/libs/win64/libSDL264.dll.a
b/MP/code/libs/win64/libSDL264.dll.a
index 3aaa307..641b1bc 100644
Binary files a/MP/code/libs/win64/libSDL264.dll.a and
b/MP/code/libs/win64/libSDL264.dll.a differ
diff --git a/MP/code/libs/win64/libSDL2main.a
b/MP/code/libs/win64/libSDL264main.a
similarity index 98%
rename from MP/code/libs/win64/libSDL2main.a
rename to MP/code/libs/win64/libSDL264main.a
index dc7c373..f9a7613 100644
Binary files a/MP/code/libs/win64/libSDL2main.a and
b/MP/code/libs/win64/libSDL264main.a differ
diff --git a/SP/Makefile b/SP/Makefile
index a61fa92..20d2bad 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -669,9 +669,9 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
SDLDLL=SDL2.dll
else
-CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
+CLIENT_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
$(LIBSDIR)/win64/libSDL264.dll.a
-RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
+RENDERER_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
$(LIBSDIR)/win64/libSDL264.dll.a
SDLDLL=SDL264.dll
endif
diff --git a/SP/code/libs/win64/SDL264.dll b/SP/code/libs/win64/SDL264.dll
index 47bff8b..30d7f9b 100755
Binary files a/SP/code/libs/win64/SDL264.dll and
b/SP/code/libs/win64/SDL264.dll differ
diff --git a/SP/code/libs/win64/libSDL2.a b/SP/code/libs/win64/libSDL264.a
similarity index 99%
rename from SP/code/libs/win64/libSDL2.a
rename to SP/code/libs/win64/libSDL264.a
index a1db77c..0bfc7c3 100644
Binary files a/SP/code/libs/win64/libSDL2.a and
b/SP/code/libs/win64/libSDL264.a differ
diff --git a/SP/code/libs/win64/libSDL264.dll.a
b/SP/code/libs/win64/libSDL264.dll.a
index 3aaa307..641b1bc 100644
Binary files a/SP/code/libs/win64/libSDL264.dll.a and
b/SP/code/libs/win64/libSDL264.dll.a differ
diff --git a/SP/code/libs/win64/libSDL2main.a
b/SP/code/libs/win64/libSDL264main.a
similarity index 98%
rename from SP/code/libs/win64/libSDL2main.a
rename to SP/code/libs/win64/libSDL264main.a
index dc7c373..f9a7613 100644
Binary files a/SP/code/libs/win64/libSDL2main.a and
b/SP/code/libs/win64/libSDL264main.a differ
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 18/497: All: Fix stuttering in non-local looping sounds
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit e9549aada01a15b18e1149bd71480806b3bb64cd
Author: m4n4t4...@gmail.com
Date: Wed Jan 22 17:36:43 2014 +
All: Fix stuttering in non-local looping sounds
---
MP/code/client/snd_openal.c | 7 ---
SP/code/client/snd_openal.c | 7 ---
2 files changed, 14 deletions(-)
diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
index c489fd3..60c3e62 100644
--- a/MP/code/client/snd_openal.c
+++ b/MP/code/client/snd_openal.c
@@ -1479,15 +1479,8 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
else
VectorClear(svelocity);
- if ( volume > 255 ) {
- volume = 255;
- } else if ( volume < 0 ) {
- volume = 0;
- }
-
qalSourcefv(curSource->alSource, AL_POSITION, (ALfloat *)
sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, (ALfloat *)
svelocity);
- S_AL_Gain(curSource->alSource, volume / 255.0f);
}
}
diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
index 96c2c2c..e101e6f 100644
--- a/SP/code/client/snd_openal.c
+++ b/SP/code/client/snd_openal.c
@@ -1479,15 +1479,8 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
else
VectorClear(svelocity);
- if ( volume > 255 ) {
- volume = 255;
- } else if ( volume < 0 ) {
- volume = 0;
- }
-
qalSourcefv(curSource->alSource, AL_POSITION, (ALfloat *)
sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, (ALfloat *)
svelocity);
- S_AL_Gain(curSource->alSource, volume / 255.0f);
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 16/497: All: Change to full volume for AddRealLoopingSound (not used) in AL
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 594d44efdc27964dbc23f1f40b5fda4ce1387766
Author: m4n4t4...@gmail.com
Date: Mon Jan 20 22:08:17 2014 +
All: Change to full volume for AddRealLoopingSound (not used) in AL
---
MP/code/client/snd_openal.c | 2 +-
SP/code/client/snd_openal.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
index 68ba042..c489fd3 100644
--- a/MP/code/client/snd_openal.c
+++ b/MP/code/client/snd_openal.c
@@ -1508,7 +1508,7 @@ S_AL_AddRealLoopingSound
*/
static void S_AL_AddRealLoopingSound(int entityNum, const vec3_t origin, const
vec3_t velocity, const int range, sfxHandle_t sfx)
{
- S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum, 0);
+ S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum, 255);
}
/*
diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
index 52ea8f1..96c2c2c 100644
--- a/SP/code/client/snd_openal.c
+++ b/SP/code/client/snd_openal.c
@@ -1508,7 +1508,7 @@ S_AL_AddRealLoopingSound
*/
static void S_AL_AddRealLoopingSound(int entityNum, const vec3_t origin, const
vec3_t velocity, const int range, sfxHandle_t sfx)
{
- S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum, 0);
+ S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum, 255);
}
/*
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 17/497: MP: Add stub for FS_Delete (not used in MP)
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 47a1152a47f4aa62bc654e4ce27e2a69693da383
Author: m4n4t4...@gmail.com
Date: Mon Jan 20 22:21:32 2014 +
MP: Add stub for FS_Delete (not used in MP)
---
MP/code/qcommon/files.c | 34 ++
1 file changed, 34 insertions(+)
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index dc3dd9b..15b5dce 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -1719,6 +1719,40 @@ qboolean FS_CL_ExtractFromPakFile( void *searchpath,
const char *fullpath, const
#endif
/*
+==
+FS_Delete
+TTimo - this was not in the 1.30 filesystem code
+using fs_homepath for the file to remove
+==
+*/
+int FS_Delete( char *filename ) {
+#if 0 // Stub...not used in MP
+ char *ospath;
+
+ if ( !fs_searchpaths ) {
+ Com_Error( ERR_FATAL, "Filesystem call made without
initialization\n" );
+ }
+
+ if ( !filename || filename[0] == 0 ) {
+ return 0;
+ }
+
+ // for safety, only allow deletion from the save directory
+ if ( Q_strncmp( filename, "save/", 5 ) != 0 ) {
+ return 0;
+ }
+
+ ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, filename );
+
+ if ( remove( ospath ) != -1 ) { // success
+ return 1;
+ }
+#endif
+
+ return 0;
+}
+
+/*
=
FS_Read
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 19/497: All: Fix indentation issue in Makefiles
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 1dfad374cb0ee7c39f1f737b233e116b901a564a Author: m4n4t4...@gmail.com Date: Thu Jan 23 20:00:20 2014 + All: Fix indentation issue in Makefiles --- MP/Makefile | 4 ++-- SP/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MP/Makefile b/MP/Makefile index 7d78265..6320bf4 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -2516,7 +2516,7 @@ endif ifneq ($(BUILD_GAME_SO),0) ifneq ($(BUILD_BASEGAME),0) - ifeq ($(PLATFORM),mingw32) +ifeq ($(PLATFORM),mingw32) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame_mp_$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame_mp_$(SHLIBNAME) \ @@ -2530,7 +2530,7 @@ ifneq ($(BUILD_GAME_SO),0) $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui.mp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. - endif +endif endif endif diff --git a/SP/Makefile b/SP/Makefile index 20d2bad..9de45fc 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -2535,21 +2535,21 @@ endif ifneq ($(BUILD_GAME_SO),0) ifneq ($(BUILD_BASEGAME),0) - ifeq ($(PLATFORM),mingw32) +ifeq ($(PLATFORM),mingw32) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame_sp_$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame_sp_$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui_sp_$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. - else +else $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. - endif +endif endif endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 15/497: All: Make the AL version of AddLoopingSound closer to Base version
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 1147f7a4978e616061ac148a6f2784439a7f4b27
Author: m4n4t4...@gmail.com
Date: Mon Jan 20 22:06:24 2014 +
All: Make the AL version of AddLoopingSound closer to Base version
---
MP/code/client/snd_openal.c | 20 +---
SP/code/client/snd_openal.c | 20 +---
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
index 0657066..68ba042 100644
--- a/MP/code/client/snd_openal.c
+++ b/MP/code/client/snd_openal.c
@@ -1388,7 +1388,7 @@ S_AL_SrcLoop
=
*/
static void S_AL_SrcLoop( alSrcPriority_t priority, sfxHandle_t sfx,
- const vec3_t origin, const vec3_t velocity, int entityNum )
+ const vec3_t origin, const vec3_t velocity, int entityNum, int
volume )
{
int src;
sentity_t *sent = &entityList[ entityNum ];
@@ -1448,8 +1448,15 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
VectorClear(sorigin);
+ if ( volume > 255 ) {
+ volume = 255;
+ } else if ( volume < 0 ) {
+ volume = 0;
+ }
+
qalSourcefv(curSource->alSource, AL_POSITION, sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, vec3_origin);
+ S_AL_Gain(curSource->alSource, volume / 255.0f);
}
else
{
@@ -1472,8 +1479,15 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
else
VectorClear(svelocity);
+ if ( volume > 255 ) {
+ volume = 255;
+ } else if ( volume < 0 ) {
+ volume = 0;
+ }
+
qalSourcefv(curSource->alSource, AL_POSITION, (ALfloat *)
sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, (ALfloat *)
svelocity);
+ S_AL_Gain(curSource->alSource, volume / 255.0f);
}
}
@@ -1484,7 +1498,7 @@ S_AL_AddLoopingSound
*/
static void S_AL_AddLoopingSound(int entityNum, const vec3_t origin, const
vec3_t velocity, const int range, sfxHandle_t sfx, int volume)
{
- S_AL_SrcLoop(SRCPRI_ENTITY, sfx, origin, velocity, entityNum);
+ S_AL_SrcLoop(SRCPRI_ENTITY, sfx, origin, velocity, entityNum, volume);
}
/*
@@ -1494,7 +1508,7 @@ S_AL_AddRealLoopingSound
*/
static void S_AL_AddRealLoopingSound(int entityNum, const vec3_t origin, const
vec3_t velocity, const int range, sfxHandle_t sfx)
{
- S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum);
+ S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum, 0);
}
/*
diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
index f9dc9bd..52ea8f1 100644
--- a/SP/code/client/snd_openal.c
+++ b/SP/code/client/snd_openal.c
@@ -1388,7 +1388,7 @@ S_AL_SrcLoop
=
*/
static void S_AL_SrcLoop( alSrcPriority_t priority, sfxHandle_t sfx,
- const vec3_t origin, const vec3_t velocity, int entityNum )
+ const vec3_t origin, const vec3_t velocity, int entityNum, int
volume )
{
int src;
sentity_t *sent = &entityList[ entityNum ];
@@ -1448,8 +1448,15 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
VectorClear(sorigin);
+ if ( volume > 255 ) {
+ volume = 255;
+ } else if ( volume < 0 ) {
+ volume = 0;
+ }
+
qalSourcefv(curSource->alSource, AL_POSITION, sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, vec3_origin);
+ S_AL_Gain(curSource->alSource, volume / 255.0f);
}
else
{
@@ -1472,8 +1479,15 @@ static void S_AL_SrcLoop( alSrcPriority_t priority,
sfxHandle_t sfx,
else
VectorClear(svelocity);
+ if ( volume > 255 ) {
+ volume = 255;
+ } else if ( volume < 0 ) {
+ volume = 0;
+ }
+
qalSourcefv(curSource->alSource, AL_POSITION, (ALfloat *)
sorigin);
qalSourcefv(curSource->alSource, AL_VELOCITY, (ALfloat *)
svelocity);
+ S_AL_Gain(curSource->alSource, volume / 255.0f);
}
}
@@ -1484,7 +1498,7 @@ S_AL_AddLoopingSound
*/
static void S_AL_AddLoopingSound(int entityNum, const vec3_t origin, const
vec3_t velocity, const int range, sfxHandle_t sfx, int volume)
{
- S_AL_SrcLoop(SRCPRI_ENTITY, sfx, origin, velocity, entityNum);
+ S_AL_SrcLoop(SRCPRI_ENTITY, sfx, origin, velocity, entityNum, volume);
}
/*
@@ -1494,7 +1508,7 @@ S_AL_AddRealLoopi
[iortcw] 22/497: MP: Use Punkbuster MD5 implementation for cl_guid / Rename autogenerated key to avoid confusion
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 79137ec27d8589259f18701d05a2b67746991695
Author: m4n4t4...@gmail.com
Date: Fri Jan 24 01:04:08 2014 +
MP: Use Punkbuster MD5 implementation for cl_guid / Rename autogenerated
key to avoid confusion
---
MP/Makefile | 8
MP/code/client/cl_main.c | 4
MP/code/client/client.h | 2 +-
MP/code/qcommon/md5.c | 4
MP/code/qcommon/qcommon.h | 4
5 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/MP/Makefile b/MP/Makefile
index bb13532..55ac0a5 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -244,6 +244,10 @@ ifndef USE_OPENGLES
USE_OPENGLES=0
endif
+ifndef USE_PBMD5
+USE_PBMD5=1
+endif
+
#
@@ -1115,6 +1119,9 @@ ifeq ($(USE_BLOOM),1)
CLIENT_CFLAGS += -DUSE_BLOOM
endif
+ifeq ($(USE_PBMD5),1)
+ CLIENT_CFLAGS += -DUSE_PBMD5
+endif
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
@@ -1492,6 +1499,7 @@ Q3OBJ = \
$(B)/client/files.o \
$(B)/client/md4.o \
$(B)/client/md5.o \
+ $(B)/client/pbmd5.o \
$(B)/client/msg.o \
$(B)/client/net_chan.o \
$(B)/client/net_ip.o \
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 0824bca..06bc9f6 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -1425,6 +1425,7 @@ update cl_guid using QKEY_FILE and optional prefix
*/
static void CL_UpdateGUID( const char *prefix, int prefix_len )
{
+#if !defined( USE_PBMD5 )
fileHandle_t f;
int len;
@@ -1436,6 +1437,9 @@ static void CL_UpdateGUID( const char *prefix, int
prefix_len )
else
Cvar_Set( "cl_guid", Com_MD5File( QKEY_FILE, QKEY_SIZE,
prefix, prefix_len ) );
+#else
+ Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) );
+#endif
}
static void CL_OldGame(void)
diff --git a/MP/code/client/client.h b/MP/code/client/client.h
index aa5a2cc..cdd2fe7 100644
--- a/MP/code/client/client.h
+++ b/MP/code/client/client.h
@@ -46,7 +46,7 @@ If you have questions concerning this license or the
applicable additional terms
#endif
// file full of random crap that gets used to create cl_guid
-#define QKEY_FILE "rtcwkey"
+#define QKEY_FILE "wkey"
#define QKEY_SIZE 2048
#defineRETRANSMIT_TIMEOUT 3000// time between connection
packet retransmits
diff --git a/MP/code/qcommon/md5.c b/MP/code/qcommon/md5.c
index 994083f..4396fa1 100644
--- a/MP/code/qcommon/md5.c
+++ b/MP/code/qcommon/md5.c
@@ -14,6 +14,8 @@
* needed on buffers full of bytes, and then call MD5Final, which
* will fill a supplied 16-byte array with the digest.
*/
+#ifndef USE_PBMD5
+
#include "q_shared.h"
#include "qcommon.h"
@@ -308,3 +310,5 @@ char *Com_MD5File( const char *fn, int length, const char
*prefix, int prefix_le
}
return final;
}
+
+#endif // USE_PBMD5
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
index 7d511d6..3626fa8 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
@@ -938,7 +938,11 @@ void Com_GameRestart(int checksumFeed,
qboolean disconnect);
int Com_Milliseconds( void ); // will be journaled properly
unsignedCom_BlockChecksum( const void *buffer, int length );
+#if !defined( USE_PBMD5 )
char *Com_MD5File(const char *filename, int length, const char
*prefix, int prefix_len);
+#else
+char *Com_PBMD5File( char *key );
+#endif
int Com_Filter( char *filter, char *name, int casesensitive );
int Com_FilterPath( char *filter, char *name, int casesensitive );
int Com_RealTime( qtime_t *qtime );
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 21/497: All: Remove check for Windows versions in make copyfiles
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 1e2cc90360b5aafd091e8de99876b3689c3c7cb7 Author: m4n4t4...@gmail.com Date: Thu Jan 23 21:33:52 2014 + All: Remove check for Windows versions in make copyfiles --- MP/Makefile | 9 - SP/Makefile | 9 - 2 files changed, 18 deletions(-) diff --git a/MP/Makefile b/MP/Makefile index 861fed8..bb13532 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -2516,21 +2516,12 @@ endif ifneq ($(BUILD_GAME_SO),0) ifneq ($(BUILD_BASEGAME),0) -ifeq ($(PLATFORM),mingw32) - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame_mp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame_mp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui_mp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. -else $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame.mp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame.mp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui.mp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. -endif endif endif diff --git a/SP/Makefile b/SP/Makefile index 9de45fc..07e38c9 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -2535,21 +2535,12 @@ endif ifneq ($(BUILD_GAME_SO),0) ifneq ($(BUILD_BASEGAME),0) -ifeq ($(PLATFORM),mingw32) - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame_sp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame_sp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui_sp_$(SHLIBNAME) \ - $(COPYDIR)/$(BASEGAME)/. -else $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui.sp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. -endif endif endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 20/497: MP: Missed one line in last commit
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 8b787afb17a69b682626b7a49009aebc02814b4f Author: m4n4t4...@gmail.com Date: Thu Jan 23 20:14:43 2014 + MP: Missed one line in last commit --- MP/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP/Makefile b/MP/Makefile index 6320bf4..861fed8 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -2523,7 +2523,7 @@ ifneq ($(BUILD_GAME_SO),0) $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui_mp_$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. - else +else $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame.mp.$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame.mp.$(SHLIBNAME) \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 23/497: MP: Add the Punkbuster implementation of MD5
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 1aa33060f258e77ed389d0c86450de4c2e1c8bd2
Author: m4n4t4...@gmail.com
Date: Fri Jan 24 01:05:21 2014 +
MP: Add the Punkbuster implementation of MD5
---
MP/code/qcommon/pbmd5.c | 381
1 file changed, 381 insertions(+)
diff --git a/MP/code/qcommon/pbmd5.c b/MP/code/qcommon/pbmd5.c
new file mode 100644
index 000..524c9c9
--- /dev/null
+++ b/MP/code/qcommon/pbmd5.c
@@ -0,0 +1,381 @@
+//
+// PunkBuster Implementation of MD5 by RSA Data Security, Inc.
+//
+
+//
+// md5.h
+//
+// style modified by Tony Ray, January 2001
+// added support for randomizing initialization constants in MD5Init()
+
+/*
+ **
+ ** md5.h -- Header file for implementation of MD5 **
+ ** RSA Data Security, Inc. MD5 Message Digest Algorithm **
+ ** Created: 2/17/90 RLR **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version **
+ ** Revised (for MD5): RLR 4/27/91 **
+ ** -- G modified to have y&~z instead of y&z **
+ ** -- FF, GG, HH modified to add in last register done**
+ ** -- Access pattern: round 2 works mod 5, round 3 works mod 3**
+ ** -- distinct additive constant for each step**
+ ** -- round 4 added, working mod 7**
+ **
+ */
+
+/*
+ **
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
+ ** **
+ ** License to copy and use this software is granted provided that **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message **
+ ** Digest Algorithm" in all material mentioning or referencing this **
+ ** software or this function. **
+ ** **
+ ** License is also granted to make and use derivative works **
+ ** provided that such works are identified as "derived from the RSA **
+ ** Data Security, Inc. MD5 Message Digest Algorithm" in all **
+ ** material mentioning or referencing the derived work. **
+ ** **
+ ** RSA Data Security, Inc. makes no representations concerning **
+ ** either the merchantability of this software or the suitability **
+ ** of this software for any particular purpose. It is provided "as **
+ ** is" without express or implied warranty of any kind. **
+ ** **
+ ** These notices must be retained in any copies of any part of this **
+ ** documentation and/or software. **
+ **
+ */
+#ifdef USE_PBMD5
+
+#include "q_shared.h"
+#include "qcommon.h"
+
+/* typedef a 32 bit type */
+typedef unsigned long int UINT4;
+
+/* Data structure for MD5 (Message Digest) computation */
+typedef struct {
+ UINT4 i[2]; /* number of _bits_ handled mod 2^64 */
+ UINT4 buf[4]; /* scratch buffer */
+ unsigned char in[64];/* input buffer */
+ unsigned char digest[16]; /* actual digest after MD5Final call */
+} MD5_CTX;
+
+
+//
+// md5.cpp
+//
+// style modified by Tony Ray, January 2001
+// added support for randomizing initialization constants in MD5Init()
+
+/*
+ **
+ ** md5.c**
+ ** RSA Data Security, Inc. MD5 Message Digest Algorithm **
+ ** Created: 2/17/90 RLR **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version **
+ **
+ */
+
+/*
+ **
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
+ ** **
+ ** License to copy and use this software is granted provided that **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message **
+ ** Digest Algorithm" in all material mentioning or referencing this **
+ ** software or this function. **
+ ** **
+ ** License is also granted to make and use derivative works
[iortcw] 24/497: MP: Remove the console print of CD key / clean up some stuff uncrustify shifted
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 5ab5797abe0490b54674813a45552aa7e66b32af
Author: m4n4t4...@gmail.com
Date: Fri Jan 24 02:25:21 2014 +
MP: Remove the console print of CD key / clean up some stuff uncrustify
shifted
---
MP/code/qcommon/pbmd5.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/MP/code/qcommon/pbmd5.c b/MP/code/qcommon/pbmd5.c
index 524c9c9..007322d 100644
--- a/MP/code/qcommon/pbmd5.c
+++ b/MP/code/qcommon/pbmd5.c
@@ -322,7 +322,7 @@ char *Com_PBMD5File( char *key ) {
k = key;
- Com_DPrintf( "GUID of cdkey %s: ", k );
+// Com_DPrintf( "GUID of cdkey %s: ", k );
// Process first seed
k = do_md5x( k, strlen( k ), get_num( "0x00b684a3", NULL ) );
@@ -330,7 +330,7 @@ char *Com_PBMD5File( char *key ) {
// Process second seed
k = do_md5x( k, 32, get_num( "0x00051a56", NULL ) );
- Com_DPrintf( "%s\n", k );
+// Com_DPrintf( "%s\n", k );
return k;
}
@@ -339,7 +339,7 @@ char *Com_PBMD5File( char *key ) {
char *do_md5x( char *data, int len, int seed ) {
MD5_CTX ctx;
int i;
- char *p;
+ char *p;
static char ret[33];
static const char hex[] = "0123456789abcdef";
@@ -353,19 +353,20 @@ char *do_md5x( char *data, int len, int seed ) {
*p++ = hex[ctx.digest[i] & 15];
}
*p = 0;
- return( ret );
+
+ return ret;
}
int get_num( char *str, int *len ) {
- int num,
- tmp;
+ int num, tmp;
if ( !len ) {
len = &tmp;
}
*len = 0;
+
if ( !str[0] ) {
return( 0 );
}
@@ -374,7 +375,7 @@ int get_num( char *str, int *len ) {
} else {
sscanf( str, "%d%n", &num, len );
}
- return( num );
+ return num;
}
#endif // USE_PBMD5
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 28/497: All: Check for buffer overflow for rail/lightning surfaces
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 03cb2908140e8ab6e98dc65b40ae77edbbcf0e13 Author: m4n4t4...@gmail.com Date: Sun Jan 26 04:08:03 2014 + All: Check for buffer overflow for rail/lightning surfaces --- MP/code/rend2/tr_surface.c| 2 ++ MP/code/renderer/tr_surface.c | 2 ++ SP/code/rend2/tr_surface.c| 2 ++ SP/code/renderer/tr_surface.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/MP/code/rend2/tr_surface.c b/MP/code/rend2/tr_surface.c index b0cf496..a6c6eed 100644 --- a/MP/code/rend2/tr_surface.c +++ b/MP/code/rend2/tr_surface.c @@ -753,6 +753,8 @@ static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, f int vbase; float t = len / 256.0f; + RB_CHECKOVERFLOW( 4, 6 ); + vbase = tess.numVertexes; spanWidth2 = -spanWidth; diff --git a/MP/code/renderer/tr_surface.c b/MP/code/renderer/tr_surface.c index a40a110..d52a41b 100644 --- a/MP/code/renderer/tr_surface.c +++ b/MP/code/renderer/tr_surface.c @@ -482,6 +482,8 @@ static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, f int vbase; float t = len / 256.0f; + RB_CHECKOVERFLOW( 4, 6 ); + vbase = tess.numVertexes; spanWidth2 = -spanWidth; diff --git a/SP/code/rend2/tr_surface.c b/SP/code/rend2/tr_surface.c index 66959fb..b248b8c 100644 --- a/SP/code/rend2/tr_surface.c +++ b/SP/code/rend2/tr_surface.c @@ -751,6 +751,8 @@ static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, f int vbase; float t = len / 256.0f; + RB_CHECKOVERFLOW( 4, 6 ); + vbase = tess.numVertexes; spanWidth2 = -spanWidth; diff --git a/SP/code/renderer/tr_surface.c b/SP/code/renderer/tr_surface.c index 6d55703..b5f4b5c 100644 --- a/SP/code/renderer/tr_surface.c +++ b/SP/code/renderer/tr_surface.c @@ -482,6 +482,8 @@ static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, f int vbase; float t = len / 256.0f; + RB_CHECKOVERFLOW( 4, 6 ); + vbase = tess.numVertexes; spanWidth2 = -spanWidth; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 27/497: All: Don't play all 'local' sounds at full volume
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit ca7951651495d58544cf20c06a6abf3f672d7a35
Author: m4n4t4...@gmail.com
Date: Sun Jan 26 02:05:57 2014 +
All: Don't play all 'local' sounds at full volume
---
MP/code/client/snd_dma.c | 2 +-
SP/code/client/snd_dma.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MP/code/client/snd_dma.c b/MP/code/client/snd_dma.c
index a03fdb6..c7e2f1f 100644
--- a/MP/code/client/snd_dma.c
+++ b/MP/code/client/snd_dma.c
@@ -649,7 +649,7 @@ static void S_Base_MainStartSound( vec3_t origin, int
entityNum, int entchannel,
}
fullVolume = qfalse;
- if (localSound || S_Base_HearingThroughEntity(entityNum, origin)) {
+ if (S_Base_HearingThroughEntity(entityNum, origin)) {
fullVolume = qtrue;
}
diff --git a/SP/code/client/snd_dma.c b/SP/code/client/snd_dma.c
index 7a8fafd..ddb6965 100644
--- a/SP/code/client/snd_dma.c
+++ b/SP/code/client/snd_dma.c
@@ -653,7 +653,7 @@ static void S_Base_MainStartSound( vec3_t origin, int
entityNum, int entchannel,
}
fullVolume = qfalse;
- if (localSound || S_Base_HearingThroughEntity(entityNum, origin)) {
+ if (S_Base_HearingThroughEntity(entityNum, origin)) {
fullVolume = qtrue;
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 26/497: MP: Use upper-case for Punkbuster cl_guid like vanilla client
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit ee12f9446141f416f52200d5910bbb5dcfc8
Author: m4n4t4...@gmail.com
Date: Sat Jan 25 19:59:50 2014 +
MP: Use upper-case for Punkbuster cl_guid like vanilla client
---
MP/code/qcommon/pbmd5.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/MP/code/qcommon/pbmd5.c b/MP/code/qcommon/pbmd5.c
index 007322d..3e8d783 100644
--- a/MP/code/qcommon/pbmd5.c
+++ b/MP/code/qcommon/pbmd5.c
@@ -319,6 +319,7 @@ int get_num( char *str, int *len );
char *Com_PBMD5File( char *key ) {
char*k;
+ char*guid;
k = key;
@@ -330,9 +331,10 @@ char *Com_PBMD5File( char *key ) {
// Process second seed
k = do_md5x( k, 32, get_num( "0x00051a56", NULL ) );
-// Com_DPrintf( "%s\n", k );
+ guid = Q_strupr( k );
+// Com_DPrintf( "%s\n", guid );
- return k;
+ return guid;
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 32/497: All: Re-allow setting OpenAL input device / Fix fallback driver code
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 7a3f820b06a3c0f707af80edf2e7af190a4e7ebb
Author: m4n4t4...@gmail.com
Date: Tue Jan 28 02:45:56 2014 +
All: Re-allow setting OpenAL input device / Fix fallback driver code
---
MP/code/client/snd_openal.c | 19 ---
SP/code/client/snd_openal.c | 18 --
2 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
index f105852..08c5ce0 100644
--- a/MP/code/client/snd_openal.c
+++ b/MP/code/client/snd_openal.c
@@ -2621,20 +2621,17 @@ qboolean S_AL_Init( soundInterface_t *si )
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM );
- s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ROM );
- s_alDevice = Cvar_Get( "s_alDevice", "", CVAR_ROM );
+ s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE |
CVAR_LATCH );
+ s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
// Load QAL
if( !QAL_Init( s_alDriver->string ) )
- {
-#ifdef _WIN64
- s_alDriver = Cvar_Get( "s_alDriver", "OpenAL32.dll", CVAR_ROM
); // Try falling back to default name
- if ( !QAL_Init( s_alDriver->string ) )
-#endif
- Com_Printf( "Failed to load library: \"%s\".\n",
s_alDriver->string );
-
- return qfalse;
- }
+ {
+ Com_Printf( "Failed to load library: \"%s\".\n",
s_alDriver->string );
+ if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) ||
!QAL_Init( ALDRIVER_DEFAULT ) ) {
+ return qfalse;
+ }
+ }
device = s_alDevice->string;
if(device && !*device)
diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
index b5eae81..8b62da6 100644
--- a/SP/code/client/snd_openal.c
+++ b/SP/code/client/snd_openal.c
@@ -2660,19 +2660,17 @@ qboolean S_AL_Init( soundInterface_t *si )
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM );
- s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ROM );
- s_alDevice = Cvar_Get( "s_alDevice", "", CVAR_ROM );
+ s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE |
CVAR_LATCH );
+ s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
// Load QAL
if( !QAL_Init( s_alDriver->string ) )
- {
-#ifdef _WIN64
- s_alDriver = Cvar_Get( "s_alDriver", "OpenAL32.dll", CVAR_ROM
); // Try falling back to default name
- if ( !QAL_Init( s_alDriver->string ) )
-#endif
- Com_Printf( "Failed to load library: \"%s\".\n",
s_alDriver->string );
- return qfalse;
- }
+ {
+ Com_Printf( "Failed to load library: \"%s\".\n",
s_alDriver->string );
+ if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) ||
!QAL_Init( ALDRIVER_DEFAULT ) ) {
+ return qfalse;
+ }
+ }
device = s_alDevice->string;
if(device && !*device)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 31/497: All: Fix check for jpeg_mem_ to work with libjpeg-turbo
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 79967c15163181c2fb0f0eeacf789452fb58b5a5 Author: m4n4t4...@gmail.com Date: Tue Jan 28 01:18:21 2014 + All: Fix check for jpeg_mem_ to work with libjpeg-turbo --- MP/code/rend2/tr_image_jpg.c| 4 ++-- MP/code/renderer/tr_image_jpg.c | 4 ++-- SP/code/rend2/tr_image_jpg.c| 4 ++-- SP/code/renderer/tr_image_jpg.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP/code/rend2/tr_image_jpg.c b/MP/code/rend2/tr_image_jpg.c index f0ffb71..abe5e65 100644 --- a/MP/code/rend2/tr_image_jpg.c +++ b/MP/code/rend2/tr_image_jpg.c @@ -41,8 +41,8 @@ externrefimport_t ri; #include #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -#error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +#error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/MP/code/renderer/tr_image_jpg.c b/MP/code/renderer/tr_image_jpg.c index 817588b..b16b3df 100644 --- a/MP/code/renderer/tr_image_jpg.c +++ b/MP/code/renderer/tr_image_jpg.c @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -#error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +#error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/SP/code/rend2/tr_image_jpg.c b/SP/code/rend2/tr_image_jpg.c index f0ffb71..abe5e65 100644 --- a/SP/code/rend2/tr_image_jpg.c +++ b/SP/code/rend2/tr_image_jpg.c @@ -41,8 +41,8 @@ externrefimport_t ri; #include #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -#error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +#error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/SP/code/renderer/tr_image_jpg.c b/SP/code/renderer/tr_image_jpg.c index 817588b..b16b3df 100644 --- a/SP/code/renderer/tr_image_jpg.c +++ b/SP/code/renderer/tr_image_jpg.c @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -#error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +#error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 25/497: MP: Only calculate cl_guid on startup when using Punkbuster MD5
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 450a83bce9aff60b4c1dc6dbdaa738f95c41a1b8
Author: m4n4t4...@gmail.com
Date: Sat Jan 25 18:22:07 2014 +
MP: Only calculate cl_guid on startup when using Punkbuster MD5
---
MP/code/client/cl_main.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 06bc9f6..0be5931 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -143,6 +143,7 @@ cvar_t *cl_updatefiles;
cvar_t *cl_lanForcePackets;
+cvar_t *cl_guid;
cvar_t *cl_guidServerUniq;
cvar_t *cl_consoleKeys;
@@ -1438,7 +1439,10 @@ static void CL_UpdateGUID( const char *prefix, int
prefix_len )
Cvar_Set( "cl_guid", Com_MD5File( QKEY_FILE, QKEY_SIZE,
prefix, prefix_len ) );
#else
- Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) );
+ if ( strcmp( cl_guid->string,"" ) == 0 )
+ Cvar_Set( "cl_guid", Com_PBMD5File( cl_cdkey ) );
+ else
+ return;
#endif
}
@@ -4075,6 +4079,8 @@ void CL_Init( void ) {
cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
+ cl_guid = Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
+
cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE);
// ~ and `, as keys and characters
@@ -4236,7 +4242,6 @@ void CL_Init( void ) {
CL_InitTranslation(); // NERVE - SMF - localization
CL_GenerateQKey();
- Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
CL_UpdateGUID( NULL, 0 );
Com_Printf( "- Client Initialization Complete -\n" );
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 33/497: All: Revert r507
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 35fd158a38e60ce6bc0e0de9295d731a3dd383d9
Author: m4n4t4...@gmail.com
Date: Tue Jan 28 05:03:45 2014 +
All: Revert r507
---
MP/code/client/snd_openal.c | 2 +-
SP/code/client/snd_openal.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
index 08c5ce0..bdb7ce1 100644
--- a/MP/code/client/snd_openal.c
+++ b/MP/code/client/snd_openal.c
@@ -2619,7 +2619,7 @@ qboolean S_AL_Init( soundInterface_t *si )
s_alRolloff = Cvar_Get( "s_alRolloff", "2", CVAR_CHEAT);
s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_CHEAT);
- s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM );
+ s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE |
CVAR_LATCH );
s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE |
CVAR_LATCH );
s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
index 8b62da6..874affa 100644
--- a/SP/code/client/snd_openal.c
+++ b/SP/code/client/snd_openal.c
@@ -2658,7 +2658,7 @@ qboolean S_AL_Init( soundInterface_t *si )
s_alRolloff = Cvar_Get( "s_alRolloff", "1.3", CVAR_ARCHIVE);
s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_ARCHIVE);
- s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM );
+ s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE |
CVAR_LATCH );
s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE |
CVAR_LATCH );
s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
