]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
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
::stable-branch::merge=9de9674afc1bbbb4b43fdda8617addb1791715ce

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
::stable-branch::merge=6b1ade501453a2def2320663016d556b832e7391

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
::stable-branch::merge=a1e4d829bdfdc78974582474f385254e0a7244c8

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
::stable-branch::merge=9d50a697b0ac0b54bddcb05d96613144dc3b9b69

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
::stable-branch::merge=c3f319134f8a778eeac64d47e2190c034f3d80de

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
::stable-branch::merge=d3641b7330c7d8b70dc86d62315756785eee44b0

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
::stable-branch::merge=9fa6c695b421f09090fdc81d1a1cadbb7d360126

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
::stable-branch::merge=dddab169d13250eeb7106adc499bc5054179f3ff

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
::stable-branch::merge=d5702d667cbc29f4198611f296b583d1f329e01b

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
::stable-branch::merge=dd9ceb6ccbca98a08618a61395b7cee97973fe5a

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
::stable-branch::merge=d0c775c59f2b3e13b361e1c01354ba6fa354b1ff

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
::stable-branch::merge=838e039a52231932d842518179e069ba4f82ef7d

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
::stable-branch::merge=e6a20dbedf9ea11158142bc2c8c16dfa721d8870

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
::stable-branch::merge=f2423fcb678bccc4b18bbec6c6840fe5d89eb6dc

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
::stable-branch::merge=a94a03b60bdb6fe830843a069a511e2962718b5c

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
::stable-branch::merge=f348d973d549aa478ca3a088dee37b8b75e6a3f5

9 years ago::stable-branch::reset=bb9d5e97ff495d6908929a7bdf832e609c825b2f
Rudolf Polzer [Mon, 9 Feb 2015 09:24:07 +0000 (10:24 +0100)]
::stable-branch::reset=bb9d5e97ff495d6908929a7bdf832e609c825b2f

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
::stable-branch::merge=01fe1aa7f6a669cdf71c910baf735ce68029be57

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
::stable-branch::merge=6b35b45bab4d85378a2c813313811a73bfaeccc4

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
::stable-branch::merge=ff3dd9fb1d97b89dd888147c692cb1b582a506c6

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
::stable-branch::merge=fc6fc0deeb15cd8df633defdd4b8f72f55ea7061

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
::stable-branch::merge=157c3faf9c34d5baf6ffb94d27d2b50fc1266c50

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. xonotic-v0.8.0
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
::stable-branch::merge=d96b118b72ad0ff8779b189232994f51c8b9ec5a

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
::stable-branch::merge=3470e1323d4fe070840046d93d616d3a16b840a5

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
::stable-branch::merge=a564dacf0094af6f32873f37a3d56e0e28b83f05

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
::stable-branch::merge=b57ee47c0ea6f11447bc7a8c5108a468129be54d

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
::stable-branch::merge=d362ba8238f9fea5fc48c23da31a1e1360b33092

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
::stable-branch::merge=aa93774ce322125fc04be75ad7814c54784288a0

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
::stable-branch::merge=2e65079aedcd5ba63ea0df48837a2114bc292408

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
::stable-branch::merge=e43e96343d7397ce270127224c54a0cf1767b25a

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
::stable-branch::merge=660001dce93be41b85d5d1e92d4a6afa5de2db33

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
::stable-branch::merge=e79ce28dd6cb182be0fdc22cb79a21ed144bf409

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
::stable-branch::merge=438bc57b1be1f24b067056c8d26c1cf9e0cab26b

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
::stable-branch::merge=c5357e1210fe96d01ce3da21980a504681152a14

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
::stable-branch::merge=1580f387344173508634b04b59da81a7abd7e66f

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
::stable-branch::merge=8cf5b7b3a64a063c845dac736aed429231ec7042

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
::stable-branch::merge=f586053910b19c67c330c3168fe4661cda19e97a

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
::stable-branch::merge=3c69ebebce675210e2cc74c399cedecfac7bdcb0

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
::stable-branch::merge=9120bf3dc128de323bfc5a82553fcc310dad7a33

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
::stable-branch::merge=b4178ed6184ea882ec9eac8946fccf62a83b0898

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
::stable-branch::merge=a5bf1b9e80132c40dda71e4f6e47b911e631049d

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
::stable-branch::merge=f7793c7299c6f5683a1b390e4444dabb44576e24

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
::stable-branch::merge=38c4650341fa0142708d396aed3f4190e7e5118f

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

10 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
::stable-branch::merge=9973d76822ff8375e07694ea34c812fbbf8ebdbb

10 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
::stable-branch::merge=3d0b5dff0aa38ab192ac9aebdfe39cd23cfe2ed9

10 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

10 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

10 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
::stable-branch::merge=b4488d1563f5fa00036b2ccacfda344c3f0f254e

10 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
::stable-branch::merge=cb6472b4ced79f6cd093756c6483699761cf674d

10 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
::stable-branch::merge=8d5d46a8e8d2d015be6912419960f1a5a65ea49b

10 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
::stable-branch::merge=22dac77bc9bd23097c69404c6d0f5160c5330dc1

10 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
::stable-branch::merge=bd8b9a2b1e5464f18a7a2e6e573201d6aa9dbcca

10 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
::stable-branch::merge=0afeccfe1289b64245baf48979b6a694d077b6f0