git.rm.cloudns.org Git - xonotic/darkplaces.git/log

]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log

projects / xonotic / darkplaces.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

commit | commitdiff | tree

Rudolf Polzer [Mon, 9 Feb 2015 09:24:07 +0000 (10:24 +0100)]

::stable-branch::reset=bb9d5e97ff495d6908929a7bdf832e609c825b2f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Rudolf Polzer [Sat, 6 Dec 2014 06:43:47 +0000 (07:43 +0100)]

Empty commit to make Travis retry.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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