]> git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
9 years agoFix a NULL with missing worldmodel.
divverent [Thu, 5 Mar 2015 09:28:00 +0000 (09:28 +0000)]
Fix a NULL with missing worldmodel.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12190 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix a dead initialization. Fix a use of an uninitialized value.
divverent [Thu, 5 Mar 2015 09:21:45 +0000 (09:21 +0000)]
Fix a dead initialization. Fix a use of an uninitialized value.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12189 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix a mdfour.c oops, sorry. Forgot the argument.
divverent [Wed, 4 Mar 2015 17:31:23 +0000 (17:31 +0000)]
Fix a mdfour.c oops, sorry. Forgot the argument.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12188 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix clang-analyzer false positives.
divverent [Wed, 4 Mar 2015 17:30:20 +0000 (17:30 +0000)]
Fix clang-analyzer false positives.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12187 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix (harmless) use-after-free in zone.c.
divverent [Wed, 4 Mar 2015 17:30:16 +0000 (17:30 +0000)]
Fix (harmless) use-after-free in zone.c.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12186 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix uninitialized gunangles.
divverent [Wed, 4 Mar 2015 17:30:12 +0000 (17:30 +0000)]
Fix uninitialized gunangles.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12185 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMake mdfour thread-safe.
divverent [Wed, 4 Mar 2015 17:30:08 +0000 (17:30 +0000)]
Make mdfour thread-safe.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12184 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix a return-from-stack error.
divverent [Wed, 4 Mar 2015 17:30:03 +0000 (17:30 +0000)]
Fix a return-from-stack error.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12183 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix memory corruption in loadconfig while in game/menu.
divverent [Wed, 4 Mar 2015 14:59:32 +0000 (14:59 +0000)]
Fix memory corruption in loadconfig while in game/menu.

Autocvars are engine strings to QC, so we can't just let them die.
Instead, reset them to default, which is what the progs would expect
anyway.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12182 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix another buffer overrun in loadfont.
divverent [Wed, 4 Mar 2015 13:15:37 +0000 (13:15 +0000)]
Fix another buffer overrun in loadfont.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12181 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix underflow in various commands when using an empty file name.
divverent [Wed, 4 Mar 2015 11:49:15 +0000 (11:49 +0000)]
Fix underflow in various commands when using an empty file name.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12180 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix NULL crash in QW_CL_RequestNextDownload without connection.
divverent [Wed, 4 Mar 2015 11:49:12 +0000 (11:49 +0000)]
Fix NULL crash in QW_CL_RequestNextDownload without connection.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12179 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRemove some useless paranoid comparisons.
divverent [Wed, 4 Mar 2015 11:49:10 +0000 (11:49 +0000)]
Remove some useless paranoid comparisons.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12178 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix some signed/unsigned mess. Not a real problem though.
divverent [Wed, 4 Mar 2015 11:49:07 +0000 (11:49 +0000)]
Fix some signed/unsigned mess. Not a real problem though.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12177 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix overrun in fullinfo.
divverent [Wed, 4 Mar 2015 08:36:58 +0000 (08:36 +0000)]
Fix overrun in fullinfo.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12176 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix NULL in pause command.
divverent [Wed, 4 Mar 2015 08:36:55 +0000 (08:36 +0000)]
Fix NULL in pause command.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12175 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoJust in case, make collision cache sequence numbers unsigned too.
divverent [Mon, 2 Mar 2015 21:25:57 +0000 (21:25 +0000)]
Just in case, make collision cache sequence numbers unsigned too.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12174 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoJust in case, make QW sequence numbers unsigned too.
divverent [Mon, 2 Mar 2015 21:25:53 +0000 (21:25 +0000)]
Just in case, make QW sequence numbers unsigned too.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12173 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoJust in case, make loadsequence unsigned too.
divverent [Mon, 2 Mar 2015 21:25:50 +0000 (21:25 +0000)]
Just in case, make loadsequence unsigned too.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12172 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoJust in case, make decalsequence always unsigned too.
divverent [Mon, 2 Mar 2015 21:25:46 +0000 (21:25 +0000)]
Just in case, make decalsequence always unsigned too.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12171 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMake the move sequence an unsigned int.
divverent [Mon, 2 Mar 2015 21:25:42 +0000 (21:25 +0000)]
Make the move sequence an unsigned int.

This fixes an out-of-bounds write to movement_count because C's modulo
operation is considered harmful.

Many thanks to afl-fuzz!

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12170 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix a VERY LONG loop caused by high unreliable sequence numbers.
divverent [Mon, 2 Mar 2015 21:25:35 +0000 (21:25 +0000)]
Fix a VERY LONG loop caused by high unreliable sequence numbers.

Many thanks to afl-fuzz!

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12169 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRemove an unused type.
divverent [Mon, 2 Mar 2015 13:31:35 +0000 (13:31 +0000)]
Remove an unused type.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12168 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix warnings for missing prototypes.
divverent [Mon, 2 Mar 2015 13:31:32 +0000 (13:31 +0000)]
Fix warnings for missing prototypes.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12167 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoAdd a Code::Blocks project file for the SDL build.
divverent [Mon, 2 Mar 2015 13:31:28 +0000 (13:31 +0000)]
Add a Code::Blocks project file for the SDL build.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12166 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoArgh. Fix my last fix :( changed the wrong field to GL_TEXTURE_2D.
divverent [Mon, 2 Mar 2015 08:52:30 +0000 (08:52 +0000)]
Argh. Fix my last fix :( changed the wrong field to GL_TEXTURE_2D.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12165 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix texture type of renderbuffers (was random crap, now is GL_TEXTURE_2D).
divverent [Sun, 1 Mar 2015 18:54:11 +0000 (18:54 +0000)]
Fix texture type of renderbuffers (was random crap, now is GL_TEXTURE_2D).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12164 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoGet rid of some funny console spam on some invalid clientcommands.
divverent [Fri, 27 Feb 2015 20:21:27 +0000 (20:21 +0000)]
Get rid of some funny console spam on some invalid clientcommands.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12163 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoBetter handle invalid clc_ackframe commands.
divverent [Fri, 27 Feb 2015 20:21:24 +0000 (20:21 +0000)]
Better handle invalid clc_ackframe commands.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12162 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoCrypto: handle properly whether the a server key is signed or not.
divverent [Mon, 9 Feb 2015 11:06:06 +0000 (11:06 +0000)]
Crypto: handle properly whether the a server key is signed or not.

Provide information about client key being signed or not to QC.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12161 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix an useless NULL check, and a very funny overrun.
divverent [Mon, 9 Feb 2015 08:54:46 +0000 (08:54 +0000)]
Fix an useless NULL check, and a very funny overrun.

The overrun is in initialization of command line arguments, and thus not
exploitable.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12160 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix dodgy use of plane.normal[3] as alias to plane.dist using a union.
divverent [Mon, 9 Feb 2015 08:46:35 +0000 (08:46 +0000)]
Fix dodgy use of plane.normal[3] as alias to plane.dist using a union.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12159 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoOops, fix a printf.
divverent [Sat, 7 Feb 2015 21:15:41 +0000 (21:15 +0000)]
Oops, fix a printf.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12158 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRemove an useless null check.
divverent [Sat, 7 Feb 2015 21:15:00 +0000 (21:15 +0000)]
Remove an useless null check.

These functions can't be used in any way without passing a pointer there
anyway.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12157 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix registered/shareware detection.
divverent [Sat, 7 Feb 2015 21:14:56 +0000 (21:14 +0000)]
Fix registered/shareware detection.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12156 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoTest return values of remove().
divverent [Sat, 7 Feb 2015 21:14:52 +0000 (21:14 +0000)]
Test return values of remove().

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12155 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix userdir detection on Unix systems.
divverent [Sat, 7 Feb 2015 21:14:49 +0000 (21:14 +0000)]
Fix userdir detection on Unix systems.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12154 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix pak loading bugs.
divverent [Sat, 7 Feb 2015 21:14:45 +0000 (21:14 +0000)]
Fix pak loading bugs.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12153 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMake FS_mkdir static, and test for errors.
divverent [Sat, 7 Feb 2015 21:14:40 +0000 (21:14 +0000)]
Make FS_mkdir static, and test for errors.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12152 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoDetect negative name size in pk3s.
divverent [Sat, 7 Feb 2015 21:14:36 +0000 (21:14 +0000)]
Detect negative name size in pk3s.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12151 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoCheck lseek return values.
divverent [Sat, 7 Feb 2015 21:14:32 +0000 (21:14 +0000)]
Check lseek return values.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12150 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoReject pk3s with obviously broken central directory.
divverent [Sat, 7 Feb 2015 21:14:27 +0000 (21:14 +0000)]
Reject pk3s with obviously broken central directory.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12149 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMore coverity.
divverent [Thu, 5 Feb 2015 06:50:51 +0000 (06:50 +0000)]
More coverity.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12148 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix $# in aliases.
divverent [Wed, 4 Feb 2015 12:27:19 +0000 (12:27 +0000)]
Fix $# in aliases.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12147 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoKill more unreachable code.
divverent [Wed, 4 Feb 2015 12:24:22 +0000 (12:24 +0000)]
Kill more unreachable code.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12146 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix check order of keygen_i.
divverent [Wed, 4 Feb 2015 12:24:18 +0000 (12:24 +0000)]
Fix check order of keygen_i.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12145 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix dead code.
divverent [Wed, 4 Feb 2015 12:24:14 +0000 (12:24 +0000)]
Fix dead code.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12144 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix check/write order in LHNETADDRESS_ToString.
divverent [Wed, 4 Feb 2015 12:24:09 +0000 (12:24 +0000)]
Fix check/write order in LHNETADDRESS_ToString.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12143 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMake vabuf static in rcon authentication check as it's returned.
divverent [Wed, 4 Feb 2015 12:24:06 +0000 (12:24 +0000)]
Make vabuf static in rcon authentication check as it's returned.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12142 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoUse the correct bones count when parsing E5_COMPLEXANIMATION.
divverent [Wed, 4 Feb 2015 12:24:00 +0000 (12:24 +0000)]
Use the correct bones count when parsing E5_COMPLEXANIMATION.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12141 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoKill an useless NULL check that only confuses.
divverent [Wed, 4 Feb 2015 12:23:55 +0000 (12:23 +0000)]
Kill an useless NULL check that only confuses.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12140 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix buffer size for injecting netname into demo files.
divverent [Tue, 3 Feb 2015 11:02:51 +0000 (11:02 +0000)]
Fix buffer size for injecting netname into demo files.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12139 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoDon't match *default.cfg for default config matching.
divverent [Sat, 31 Jan 2015 20:29:57 +0000 (20:29 +0000)]
Don't match *default.cfg for default config matching.

Only match default.cfg and */default.cfg.

Rationale is that someone in Xonotic created a file called
binds-default.cfg and didn't know about this magic here, leading to
https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1444 and
https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1448

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12138 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoSet the proper @rpath in the OS X binaries.
divverent [Tue, 27 Jan 2015 13:30:15 +0000 (13:30 +0000)]
Set the proper @rpath in the OS X binaries.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12137 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoTry to insert the Xonotic icon another way (without resedit.exe).
divverent [Sun, 18 Jan 2015 15:32:27 +0000 (15:32 +0000)]
Try to insert the Xonotic icon another way (without resedit.exe).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12136 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoSet basealpha on sprites too. Makes them visible again :)
divverent [Sat, 17 Jan 2015 17:37:53 +0000 (17:37 +0000)]
Set basealpha on sprites too. Makes them visible again :)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12135 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoLooks we can get WinXP support back by sacrificing Win2k.
divverent [Sat, 10 Jan 2015 14:56:12 +0000 (14:56 +0000)]
Looks we can get WinXP support back by sacrificing Win2k.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12134 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix static linking.
divverent [Fri, 9 Jan 2015 09:02:03 +0000 (09:02 +0000)]
Fix static linking.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12133 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoUse a newer build chain for win32/win64.
divverent [Fri, 9 Jan 2015 08:51:03 +0000 (08:51 +0000)]
Use a newer build chain for win32/win64.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12132 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoDisable even mod_skeletal_animatevertices_sse on win32, as it's crashing too. Damn...
divverent [Fri, 9 Jan 2015 07:08:21 +0000 (07:08 +0000)]
Disable even mod_skeletal_animatevertices_sse on win32, as it's crashing too. Damn unaligned stack.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12131 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoNow that SSE is off, we can also kill -mstackrealign. GCC bug worked around!
divverent [Thu, 8 Jan 2015 19:34:37 +0000 (19:34 +0000)]
Now that SSE is off, we can also kill -mstackrealign. GCC bug worked around!

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12130 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoTurn off SSE in the win32 binaries. Damn travis.
divverent [Thu, 8 Jan 2015 16:51:49 +0000 (16:51 +0000)]
Turn off SSE in the win32 binaries. Damn travis.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12129 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoMake 64bit binaries the new default in our travis scripts.
divverent [Thu, 8 Jan 2015 16:47:18 +0000 (16:47 +0000)]
Make 64bit binaries the new default in our travis scripts.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12128 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRevert "If one compiler fails, try another."
divverent [Thu, 8 Jan 2015 16:47:15 +0000 (16:47 +0000)]
Revert "If one compiler fails, try another."

This reverts commit 660001dce93be41b85d5d1e92d4a6afa5de2db33.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12127 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoIf one compiler fails, try another.
divverent [Thu, 8 Jan 2015 16:27:43 +0000 (16:27 +0000)]
If one compiler fails, try another.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12126 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRevert "Try using incoming-stack-boundary=2 instead of stackrealign."
divverent [Thu, 8 Jan 2015 16:27:40 +0000 (16:27 +0000)]
Revert "Try using incoming-stack-boundary=2 instead of stackrealign."

This reverts commit 438bc57b1be1f24b067056c8d26c1cf9e0cab26b.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12125 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoTry using incoming-stack-boundary=2 instead of stackrealign.
divverent [Thu, 8 Jan 2015 15:35:35 +0000 (15:35 +0000)]
Try using incoming-stack-boundary=2 instead of stackrealign.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12124 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoODE depends on C++. So let's link that in too...
divverent [Tue, 6 Jan 2015 23:26:52 +0000 (23:26 +0000)]
ODE depends on C++. So let's link that in too...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12123 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoOops, fix whitespace again. Aw man.
divverent [Tue, 6 Jan 2015 22:50:42 +0000 (22:50 +0000)]
Oops, fix whitespace again. Aw man.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12122 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoArgh. Fix quotes.
divverent [Tue, 6 Jan 2015 22:26:03 +0000 (22:26 +0000)]
Argh. Fix quotes.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12121 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoOops. Fix whitespace.
divverent [Tue, 6 Jan 2015 16:36:10 +0000 (16:36 +0000)]
Oops. Fix whitespace.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12120 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoReformat the makeflags.
divverent [Tue, 6 Jan 2015 15:20:38 +0000 (15:20 +0000)]
Reformat the makeflags.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12119 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoAdd missing CFLAGS for ODE.
divverent [Tue, 6 Jan 2015 15:20:35 +0000 (15:20 +0000)]
Add missing CFLAGS for ODE.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12118 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoStatically link to libjpeg again on Linux. Damn jpeg8 vs jpeg62 still...
divverent [Tue, 6 Jan 2015 10:50:47 +0000 (10:50 +0000)]
Statically link to libjpeg again on Linux. Damn jpeg8 vs jpeg62 still...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12117 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix the name again.
divverent [Sun, 4 Jan 2015 13:45:34 +0000 (13:45 +0000)]
Fix the name again.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12116 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoFix an executable name (darkplaces.exe)
divverent [Sun, 4 Jan 2015 13:20:37 +0000 (13:20 +0000)]
Fix an executable name (darkplaces.exe)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12115 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoXonotic/Windows: make SDL the default build.
divverent [Sat, 3 Jan 2015 15:58:25 +0000 (15:58 +0000)]
Xonotic/Windows: make SDL the default build.

Rename the executables from xonotic-* to darkplaces-*. They are generic DP binaries, after all.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12114 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoSDL2: Fix dprint spam in the console when toggling vid_vsync on/off
divverent [Mon, 29 Dec 2014 14:56:27 +0000 (14:56 +0000)]
SDL2: Fix dprint spam in the console when toggling vid_vsync on/off

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12113 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoUse proper Unicode defined characters for the "..." chat continuation sign
divverent [Mon, 29 Dec 2014 14:55:25 +0000 (14:55 +0000)]
Use proper Unicode defined characters for the "..." chat continuation sign

From: Severin Meyer <sev.ch@web.de>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12112 d7cf8633-e32d-0410-b094-e92efae38249

9 years agoRealign stack for SDL/win32 builds. Yes, annoying, and costs performance.
divverent [Mon, 29 Dec 2014 11:11:15 +0000 (11:11 +0000)]
Realign stack for SDL/win32 builds. Yes, annoying, and costs performance.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12111 d7cf8633-e32d-0410-b094-e92efae38249

9 years agofix Con_Printf in Mod_Q2BSP_LoadNodes
eihrul [Tue, 9 Dec 2014 23:30:50 +0000 (23:30 +0000)]
fix Con_Printf in Mod_Q2BSP_LoadNodes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12110 d7cf8633-e32d-0410-b094-e92efae38249

9 years agomore miscellaneous fixes from graphitemaster
eihrul [Tue, 9 Dec 2014 23:08:33 +0000 (23:08 +0000)]
more miscellaneous fixes from graphitemaster

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12109 d7cf8633-e32d-0410-b094-e92efae38249

9 years agospecify depth and stencil attachments separately (combined attachment is only availab...
eihrul [Tue, 9 Dec 2014 14:17:22 +0000 (14:17 +0000)]
specify depth and stencil attachments separately (combined attachment is only available in GL >= 3.0)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12108 d7cf8633-e32d-0410-b094-e92efae38249

9 years agogltexture_t->glisdepthstencil fix
eihrul [Tue, 9 Dec 2014 13:38:22 +0000 (13:38 +0000)]
gltexture_t->glisdepthstencil fix

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12107 d7cf8633-e32d-0410-b094-e92efae38249

9 years agomiscellaneous fixes from graphitemaster
eihrul [Tue, 9 Dec 2014 13:30:53 +0000 (13:30 +0000)]
miscellaneous fixes from graphitemaster

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12106 d7cf8633-e32d-0410-b094-e92efae38249

9 years agocurl: do not output requirements for files that are local.
divverent [Sun, 7 Dec 2014 16:39:43 +0000 (16:39 +0000)]
curl: do not output requirements for files that are local.

Fixes a bug introduced by r12079.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12105 d7cf8633-e32d-0410-b094-e92efae38249

9 years agofixes some more Mac OS X buffer overlap errors
divverent [Wed, 26 Nov 2014 12:58:32 +0000 (12:58 +0000)]
fixes some more Mac OS X buffer overlap errors

Error report: Mac OS X 10.10 (14A389)

Crashed Thread:        0  Dispatch queue: com.apple.main-thread

Exception Type:        EXC_CRASH (SIGABRT)
Exception Codes:       0x0000000000000000, 0x0000000000000000

Application Specific Information:
detected source and destination buffer overlap

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   libsystem_kernel.dylib         0x00007fff91017282 __pthread_kill + 10
1   libsystem_c.dylib              0x00007fff922aab73 abort + 129
2   libsystem_c.dylib              0x00007fff922aacea abort_report_np + 181
3   libsystem_c.dylib              0x00007fff922d0dd0 __chk_fail + 48
4   libsystem_c.dylib              0x00007fff922d0de0 __chk_fail_overlap + 16
5   libsystem_c.dylib              0x00007fff922d0e11 __chk_overlap + 49
6   libsystem_c.dylib              0x00007fff922d0e7e __strlcpy_chk + 68
7   darkplaces-sdl                 0x0000000102903b3e SV_UpdateToReliableMessages + 398 (sv_main.c:2480)
8   darkplaces-sdl                 0x00000001029038bb SV_SendClientMessages + 59 (sv_main.c:2575)
9   darkplaces-sdl                 0x000000010278bb5e Host_Main + 3758 (host.c:910)
10  darkplaces-sdl                 0x00000001025be64f main + 239 (sys_sdl.c:223)
11  libdyld.dylib                  0x00007fff8e7735c9 start + 1

From: nyov <nyov@nexnode.net>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12104 d7cf8633-e32d-0410-b094-e92efae38249

9 years agofix a buffer overlap with newer mac osx strlcpy
divverent [Wed, 26 Nov 2014 12:58:29 +0000 (12:58 +0000)]
fix a buffer overlap with newer mac osx strlcpy

this fails on strcpy overlap detection in newer Mac OSX releases.

Error report: Mac OS X 10.10 (14A389)

Crashed Thread:        0  Dispatch queue: com.apple.main-thread

Exception Type:        EXC_CRASH (SIGABRT)
Exception Codes:       0x0000000000000000, 0x0000000000000000

Application Specific Information:
detected source and destination buffer overlap

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   libsystem_kernel.dylib         0x00007fff91017282 __pthread_kill + 10
1   libsystem_c.dylib              0x00007fff922aab73 abort + 129
2   libsystem_c.dylib              0x00007fff922aacea abort_report_np + 181
3   libsystem_c.dylib              0x00007fff922d0dd0 __chk_fail + 48
4   libsystem_c.dylib              0x00007fff922d0de0 __chk_fail_overlap + 16
5   libsystem_c.dylib              0x00007fff922d0e11 __chk_overlap + 49
6   libsystem_c.dylib              0x00007fff922d0e7e __strlcpy_chk + 68
7   darkplaces-sdl                 0x0000000104a3a29a Mod_LoadTextureFromQ3Shader + 74 (model_shared.c:2446)
8   darkplaces-sdl                 0x0000000104a21010 Mod_Q3BSP_Load + 2224 (model_brush.c:5134)
9   darkplaces-sdl                 0x0000000104a1e265 Mod_IBSP_Load + 85 (model_brush.c:7956)
10  darkplaces-sdl                 0x0000000104a3398b Mod_LoadModel + 1419 (model_shared.c:498)
11  darkplaces-sdl                 0x0000000104a37717 Mod_ForName + 55 (model_shared.c:616)
12  darkplaces-sdl                 0x0000000104ad3f28 SV_SpawnServer + 424 (sv_main.c:3284)
13  darkplaces-sdl                 0x00000001049e497f Host_Map_f + 319 (host_cmd.c:394)
14  darkplaces-sdl                 0x00000001049e4bad Host_Changelevel_f + 221 (host_cmd.c:416)
15  darkplaces-sdl                 0x000000010494d6f9 Cmd_ExecuteString + 617 (cmd.c:1936)
16  darkplaces-sdl                 0x000000010494d14d Cbuf_Execute + 781 (cmd.c:368)
17  darkplaces-sdl                 0x000000010494dbd5 Cbuf_Frame + 597 (cmd.c:384)
18  darkplaces-sdl                 0x00000001049e0109 Host_Main + 1305 (host.c:781)
19  darkplaces-sdl                 0x00000001048c2f06 main + 166 (sys_sdl.c:223)
20  libdyld.dylib                  0x00007fff8e7735c9 start + 1

From: nyov <nyov@nexnode.net>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12103 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoFix _alpha image loading.
divverent [Thu, 16 Oct 2014 12:05:04 +0000 (12:05 +0000)]
Fix _alpha image loading.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12102 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoIn current gccs, it is -mfpmath=sse, not -fpmath=sse.
divverent [Wed, 15 Oct 2014 12:06:06 +0000 (12:06 +0000)]
In current gccs, it is -mfpmath=sse, not -fpmath=sse.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12101 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoFix possible endless loop in VM_sprintf.
divverent [Wed, 15 Oct 2014 11:56:32 +0000 (11:56 +0000)]
Fix possible endless loop in VM_sprintf.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12100 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoRegenerate SSH key.
divverent [Thu, 9 Oct 2014 12:24:14 +0000 (12:24 +0000)]
Regenerate SSH key.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12099 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoIf vid_desktopfullscreen is set, manually initialize window with the current desktop...
divverent [Sat, 4 Oct 2014 20:20:22 +0000 (20:20 +0000)]
If vid_desktopfullscreen is set, manually initialize window with the current desktop resolution instead of with the default values and then letting sdl correct it automatically when they differ. It caused issues switching from fullscreen to window mode in the first game run

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12098 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoImplement proper support for utf8 characters in SDL2
divverent [Sat, 4 Oct 2014 20:16:54 +0000 (20:16 +0000)]
Implement proper support for utf8 characters in SDL2

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12097 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoSDL2: Make work numeric keypad keys when numlock is off, K_PRINTSCREEN, K_SCROLLOCK...
divverent [Sat, 4 Oct 2014 20:15:47 +0000 (20:15 +0000)]
SDL2: Make work numeric keypad keys when numlock is off, K_PRINTSCREEN,  K_SCROLLOCK and K_NUMLOCK. Also fix a debug print (event.key.keysym.unicode doesn't exist anymore in SDL2)

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12096 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoCache corona occlusion buffer
divverent [Sat, 4 Oct 2014 20:12:56 +0000 (20:12 +0000)]
Cache corona occlusion buffer

Rather than creating and destroying the occlusion buffer every frame, cache it.
This improves performance slightly.

From: Alex Goins <agoins@nvidia.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12095 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoImplement GPU-side corona fading
divverent [Sat, 4 Oct 2014 20:12:51 +0000 (20:12 +0000)]
Implement GPU-side corona fading

Uses GL_ARB_query_buffer_object to retrieve query results directly into a
buffer. This allows corona fading to be moved into the fragment shader,
preventing a round-trip to the CPU and synchronous rendering. Depending on the
machine's configuration, it can give a dramatic performance boost.

From: Alex Goins <agoins@nvidia.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12094 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoDisable SDLmain.m for SDL2.
divverent [Thu, 28 Aug 2014 12:47:58 +0000 (12:47 +0000)]
Disable SDLmain.m for SDL2.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12093 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoMore Travis changes :) Use SDL2 in all builds now.
divverent [Thu, 28 Aug 2014 12:47:55 +0000 (12:47 +0000)]
More Travis changes :) Use SDL2 in all builds now.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12092 d7cf8633-e32d-0410-b094-e92efae38249

10 years agoAdd Travis-CI integration for Xonotic.
divverent [Wed, 27 Aug 2014 12:46:22 +0000 (12:46 +0000)]
Add Travis-CI integration for Xonotic.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12091 d7cf8633-e32d-0410-b094-e92efae38249