]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
10 years agoExtra commit so the top commit doesn't look like a merge.
Rudolf Polzer [Mon, 6 Jan 2014 12:15:54 +0000 (13:15 +0100)]
Extra commit so the top commit doesn't look like a merge.

Fixes "upstream rebase detected" issues.

10 years ago::stable-branch::reset=48dd658f8bbfa60efbd5f56d1c208727c4418078
Rudolf Polzer [Mon, 6 Jan 2014 10:16:12 +0000 (11:16 +0100)]
::stable-branch::reset=48dd658f8bbfa60efbd5f56d1c208727c4418078

10 years agoPatch by graphitemaster to support column number enhanced lno format.
divverent [Mon, 6 Jan 2014 10:00:04 +0000 (10:00 +0000)]
Patch by graphitemaster to support column number enhanced lno format.

From: Dale Weiler <killfieldengine@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12040 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=48dd658f8bbfa60efbd5f56d1c208727c4418078

10 years agoDisable r_water_hideplayer while in chase camera view
divverent [Mon, 6 Jan 2014 09:49:47 +0000 (09:49 +0000)]
Disable r_water_hideplayer while in chase camera view

From: Samual Lenks <samual@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12039 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=52c7f899aabced8885deb6bbb38a696c707afcd3

10 years agoCSQC entity sending rework.
divverent [Mon, 6 Jan 2014 09:48:46 +0000 (09:48 +0000)]
CSQC entity sending rework.

Properly support returning FALSE from a CSQC entity to mean "remove".

From: Rudolf Polzer <divverent@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12038 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=43834947ad92401e07b3f39d1ab1ae42d07a1972

10 years agoKill csqcentityglobalhistory.
divverent [Mon, 6 Jan 2014 09:48:43 +0000 (09:48 +0000)]
Kill csqcentityglobalhistory.

From: Rudolf Polzer <divverent@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12037 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=840260bd8692f87bef256f1babe4f096ac965b5d

10 years agoGive CSQC entity scopes names.
divverent [Mon, 6 Jan 2014 09:48:40 +0000 (09:48 +0000)]
Give CSQC entity scopes names.

From: Rudolf Polzer <divverent@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12036 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c51c392976ac95bdb788a6cdc377f2a46cf169cb

10 years agoPatch by graphitemaster to support column number enhanced lno format.
divverent [Mon, 6 Jan 2014 10:00:04 +0000 (10:00 +0000)]
Patch by graphitemaster to support column number enhanced lno format.

From: Dale Weiler <killfieldengine@gmail.com>

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

10 years agoDisable r_water_hideplayer while in chase camera view
divverent [Mon, 6 Jan 2014 09:49:47 +0000 (09:49 +0000)]
Disable r_water_hideplayer while in chase camera view

From: Samual Lenks <samual@xonotic.org>

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

10 years agoCSQC entity sending rework.
divverent [Mon, 6 Jan 2014 09:48:46 +0000 (09:48 +0000)]
CSQC entity sending rework.

Properly support returning FALSE from a CSQC entity to mean "remove".

From: Rudolf Polzer <divverent@xonotic.org>

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

10 years agoKill csqcentityglobalhistory.
divverent [Mon, 6 Jan 2014 09:48:43 +0000 (09:48 +0000)]
Kill csqcentityglobalhistory.

From: Rudolf Polzer <divverent@xonotic.org>

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

10 years agoGive CSQC entity scopes names.
divverent [Mon, 6 Jan 2014 09:48:40 +0000 (09:48 +0000)]
Give CSQC entity scopes names.

From: Rudolf Polzer <divverent@xonotic.org>

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

10 years agoFix cl_curl_maxspeed 0 + sv_curl_maxspeed > 0.
divverent [Sat, 4 Jan 2014 12:46:04 +0000 (12:46 +0000)]
Fix cl_curl_maxspeed 0 + sv_curl_maxspeed > 0.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12035 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=26f5a6b03b23e117c585266027d8ac533a5320dc

10 years agoUnbreak most of sv_ratelimitlocalplayer.
divverent [Fri, 3 Jan 2014 08:26:05 +0000 (08:26 +0000)]
Unbreak most of sv_ratelimitlocalplayer.

A redesign to move the rate stuff from function parameters into the
netconn struct needs doing.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12034 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f022ab3a2e0a13bac6afd113840a7947518b4805

10 years ago"log_file_stripcolors" cvar to strip colors from log_file;
divverent [Mon, 23 Dec 2013 10:52:33 +0000 (10:52 +0000)]
"log_file_stripcolors" cvar to strip colors from log_file;
Also add condump_stripcolors.

From: nitroxis <nitroxis@wtwrp.de>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12033 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b81999f7852b1ab531785fab1d1a5e79ff5a92c7

10 years agoFix cl_curl_maxspeed 0 + sv_curl_maxspeed > 0.
divverent [Sat, 4 Jan 2014 12:46:04 +0000 (12:46 +0000)]
Fix cl_curl_maxspeed 0 + sv_curl_maxspeed > 0.

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

10 years agoUnbreak most of sv_ratelimitlocalplayer.
divverent [Fri, 3 Jan 2014 08:26:05 +0000 (08:26 +0000)]
Unbreak most of sv_ratelimitlocalplayer.

A redesign to move the rate stuff from function parameters into the
netconn struct needs doing.

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

11 years ago"log_file_stripcolors" cvar to strip colors from log_file;
divverent [Mon, 23 Dec 2013 10:52:33 +0000 (10:52 +0000)]
"log_file_stripcolors" cvar to strip colors from log_file;
Also add condump_stripcolors.

From: nitroxis <nitroxis@wtwrp.de>

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

11 years agoENTITYSIZEPROFILING: also log entity number and sendflags.
divverent [Thu, 19 Dec 2013 13:04:19 +0000 (13:04 +0000)]
ENTITYSIZEPROFILING: also log entity number and sendflags.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12032 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=53b4417a2ab67bf1e9fa91ad3c1d9daf42e92e7f

11 years agoENTITYSIZEPROFILING: also log entity number and sendflags.
divverent [Thu, 19 Dec 2013 13:04:19 +0000 (13:04 +0000)]
ENTITYSIZEPROFILING: also log entity number and sendflags.

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

11 years agoPatch from graphitemaster adding r_fxaa cvar, this enables the popular pseudo-antiali...
havoc [Sat, 30 Nov 2013 02:49:09 +0000 (02:49 +0000)]
Patch from graphitemaster adding r_fxaa cvar, this enables the popular pseudo-antialiasing method in postprocess.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12029 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bf5e31aa967e11a3ee0ab9f39d1d17519f720326

11 years agoUpgrade CL_VM_InputEvent to using floats rather than ints, this keeps
havoc [Sun, 15 Dec 2013 01:22:30 +0000 (01:22 +0000)]
Upgrade CL_VM_InputEvent to using floats rather than ints, this keeps
the precision on fractional absolute mouse positions.

Changed CL_VM_InputEvent passing of relative mouse moves to no longer
scale by vid_conwidth, vid_conheight as this goes against the intention
in most cases (where mouse turning or similar is being achieved).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12031 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=52e98268042cbf9d4460898e4fa8ebaa023977e2

11 years agodon't try to validate parameters to an opcode that is unrecognized
havoc [Sat, 14 Dec 2013 10:15:36 +0000 (10:15 +0000)]
don't try to validate parameters to an opcode that is unrecognized

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12030 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=99a143e9c97b009ca04e30a317d01e5b0fa15018

11 years agopatch from Blub to make BSDmakefile work again, this also changes the
havoc [Fri, 29 Nov 2013 20:14:31 +0000 (20:14 +0000)]
patch from Blub to make BSDmakefile work again, this also changes the
build directories from obj/ to build-obj/ due to pmake having a peculiar
fondness for obj/

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12028 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4774b89a8a498bbe6875a22c48f921068e51f349

11 years agoUpgrade CL_VM_InputEvent to using floats rather than ints, this keeps
havoc [Sun, 15 Dec 2013 01:22:30 +0000 (01:22 +0000)]
Upgrade CL_VM_InputEvent to using floats rather than ints, this keeps
the precision on fractional absolute mouse positions.

Changed CL_VM_InputEvent passing of relative mouse moves to no longer
scale by vid_conwidth, vid_conheight as this goes against the intention
in most cases (where mouse turning or similar is being achieved).

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

11 years agodon't try to validate parameters to an opcode that is unrecognized
havoc [Sat, 14 Dec 2013 10:15:36 +0000 (10:15 +0000)]
don't try to validate parameters to an opcode that is unrecognized

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

11 years agoPatch from graphitemaster adding r_fxaa cvar, this enables the popular pseudo-antiali...
havoc [Sat, 30 Nov 2013 02:49:09 +0000 (02:49 +0000)]
Patch from graphitemaster adding r_fxaa cvar, this enables the popular pseudo-antialiasing method in postprocess.

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

11 years agopatch from Blub to make BSDmakefile work again, this also changes the
havoc [Fri, 29 Nov 2013 20:14:31 +0000 (20:14 +0000)]
patch from Blub to make BSDmakefile work again, this also changes the
build directories from obj/ to build-obj/ due to pmake having a peculiar
fondness for obj/

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

11 years agosuppress shadow entities when preparing an rtlight with shadows
havoc [Wed, 20 Nov 2013 06:06:41 +0000 (06:06 +0000)]
suppress shadow entities when preparing an rtlight with shadows
disabled, this way we don't call R_AnimCache_GetEntity on each one

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12027 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7fbfb88e78f7ca977f68c9b61ba2a25d08ccc223

11 years agoenable CONFIG_CD on Visual Studio projects, somehow only CONFIG_MENU was added.....
havoc [Mon, 4 Nov 2013 06:36:48 +0000 (06:36 +0000)]
enable CONFIG_CD on Visual Studio projects, somehow only CONFIG_MENU was added...  which meant the cd command was missing, so even if hardware cd playback was not wanted it also lost the ability to play music entirely.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12026 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=802559a5aba2076f1e647c55e08a4d48b31612c4

11 years agoclarify in_pitch_* cvar descriptions about upward/downward values
havoc [Wed, 16 Oct 2013 20:53:13 +0000 (20:53 +0000)]
clarify in_pitch_* cvar descriptions about upward/downward values

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12025 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=adf6ed953670cfef7cdc05928435c159f3af228a

11 years agosuppress shadow entities when preparing an rtlight with shadows
havoc [Wed, 20 Nov 2013 06:06:41 +0000 (06:06 +0000)]
suppress shadow entities when preparing an rtlight with shadows
disabled, this way we don't call R_AnimCache_GetEntity on each one

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

11 years agoenable CONFIG_CD on Visual Studio projects, somehow only CONFIG_MENU was added.....
havoc [Mon, 4 Nov 2013 06:36:48 +0000 (06:36 +0000)]
enable CONFIG_CD on Visual Studio projects, somehow only CONFIG_MENU was added...  which meant the cd command was missing, so even if hardware cd playback was not wanted it also lost the ability to play music entirely.

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

11 years agoclarify in_pitch_* cvar descriptions about upward/downward values
havoc [Wed, 16 Oct 2013 20:53:13 +0000 (20:53 +0000)]
clarify in_pitch_* cvar descriptions about upward/downward values

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

11 years agoSoftware tcmod/tcgen: skip if pass needs no texcoords. Fixes #1326.
divverent [Sun, 13 Oct 2013 16:40:38 +0000 (16:40 +0000)]
Software tcmod/tcgen: skip if pass needs no texcoords. Fixes #1326.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12024 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ff5325c494f56b820830f093d26c2d2480925199

11 years agoSoftware tcmod/tcgen: skip if pass needs no texcoords. Fixes #1326.
divverent [Sun, 13 Oct 2013 16:40:38 +0000 (16:40 +0000)]
Software tcmod/tcgen: skip if pass needs no texcoords. Fixes #1326.

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

11 years agoNetconn: when an encrypted connection is used, randomly set one or more of three...
divverent [Fri, 11 Oct 2013 14:43:19 +0000 (14:43 +0000)]
Netconn: when an encrypted connection is used, randomly set one or more of three unused NETFLAGs.

When AES encryption is enabled, this will then work around substring
matching in routers/IPS thanks to CBC and our method of IV selection.
See "startkeylogger". Note that this neither improves nor weakens
security - SSL e.g. has the very issue we're fixing here because it is
based on TCP, and thus resends always are identical payloads.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12023 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d153dbd355a89226bca145dffa6a0d024b5ac8a7

11 years agoUpdate m_draw prototype in dpdefs.
divverent [Thu, 10 Oct 2013 17:15:03 +0000 (17:15 +0000)]
Update m_draw prototype in dpdefs.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12022 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=35be66cc83cf7bdd767b35e10814c037e5754839

11 years agoAdd SLIF_CATEGORY for the server list, and a menu QC function to set it.
divverent [Thu, 10 Oct 2013 17:12:47 +0000 (17:12 +0000)]
Add SLIF_CATEGORY for the server list, and a menu QC function to set it.

Callback:
float m_gethostcachecategory(float entry_id) {
// Is supposed to use gethostcachestring() etc. and return a
// category integer.
// The server list is sorted by this category first if
// SLSF_CATEGORIES is set in the sort flags.
}

From: Samual Lenks <samual@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12021 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d93b11b3f40d1ca94ed20e70c7a2fcf95670df73

11 years agoAllow refreshserverlist() to also clear the list like net_slist command.
divverent [Thu, 10 Oct 2013 17:09:20 +0000 (17:09 +0000)]
Allow refreshserverlist() to also clear the list like net_slist command.

Usage: refreshserverlist(TRUE);

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12020 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=686d46cd465ae8ea163d242384a4f9e2bba10e46

11 years agosv_checkforpacketsduringsleep: perform a netconn master server frame
divverent [Thu, 10 Oct 2013 16:53:28 +0000 (16:53 +0000)]
sv_checkforpacketsduringsleep: perform a netconn master server frame
immediately. Fixes ping view in server browser.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12019 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=84faeab78cc37a17bd009d784031602eb8d51932

11 years agoFix cl_curl_enabled 0.
divverent [Wed, 9 Oct 2013 12:55:05 +0000 (12:55 +0000)]
Fix cl_curl_enabled 0.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12018 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4f2ee5c6b22ec9ebe565df29419abb7b93b0fabe

11 years agoNetconn: when an encrypted connection is used, randomly set one or more of three...
divverent [Fri, 11 Oct 2013 14:43:19 +0000 (14:43 +0000)]
Netconn: when an encrypted connection is used, randomly set one or more of three unused NETFLAGs.

When AES encryption is enabled, this will then work around substring
matching in routers/IPS thanks to CBC and our method of IV selection.
See "startkeylogger". Note that this neither improves nor weakens
security - SSL e.g. has the very issue we're fixing here because it is
based on TCP, and thus resends always are identical payloads.

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

11 years agoUpdate m_draw prototype in dpdefs.
divverent [Thu, 10 Oct 2013 17:15:03 +0000 (17:15 +0000)]
Update m_draw prototype in dpdefs.

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

11 years agoAdd SLIF_CATEGORY for the server list, and a menu QC function to set it.
divverent [Thu, 10 Oct 2013 17:12:47 +0000 (17:12 +0000)]
Add SLIF_CATEGORY for the server list, and a menu QC function to set it.

Callback:
float m_gethostcachecategory(float entry_id) {
// Is supposed to use gethostcachestring() etc. and return a
// category integer.
// The server list is sorted by this category first if
// SLSF_CATEGORIES is set in the sort flags.
}

From: Samual Lenks <samual@xonotic.org>

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

11 years agoAllow refreshserverlist() to also clear the list like net_slist command.
divverent [Thu, 10 Oct 2013 17:09:20 +0000 (17:09 +0000)]
Allow refreshserverlist() to also clear the list like net_slist command.

Usage: refreshserverlist(TRUE);

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

11 years agosv_checkforpacketsduringsleep: perform a netconn master server frame
divverent [Thu, 10 Oct 2013 16:53:28 +0000 (16:53 +0000)]
sv_checkforpacketsduringsleep: perform a netconn master server frame
immediately. Fixes ping view in server browser.

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

11 years agoFix cl_curl_enabled 0.
divverent [Wed, 9 Oct 2013 12:55:05 +0000 (12:55 +0000)]
Fix cl_curl_enabled 0.

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

11 years agosupport "declaring" particle effects at the top of the effectinfo file
divverent [Mon, 30 Sep 2013 19:52:54 +0000 (19:52 +0000)]
support "declaring" particle effects at the top of the effectinfo file

Now "effect EFFECTNAME" without any fields set is harmless; the slot it creates
will be used by a later "effect EFFECTNAME" definition.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12017 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=57875ce96a31394cc088f5cec0ce271f2f081113

11 years agoInitialize host_dirtytime.
divverent [Sun, 29 Sep 2013 11:47:50 +0000 (11:47 +0000)]
Initialize host_dirtytime.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12016 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1feaefe934dc6ac3dfb160c4eb5ad6177f12e015

11 years agofix several visual studio projects which did not have CONFIG_MENU added
havoc [Thu, 26 Sep 2013 23:27:19 +0000 (23:27 +0000)]
fix several visual studio projects which did not have CONFIG_MENU added

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12015 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=168c67550738c884647609f43629688f8bf4d5f4

11 years agofix a typo
havoc [Thu, 26 Sep 2013 20:54:23 +0000 (20:54 +0000)]
fix a typo

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12014 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bd6ea691f42e1788efd6bb38447f889d03b9f089

11 years agoadded GAME_SSAMMO
havoc [Thu, 26 Sep 2013 20:47:40 +0000 (20:47 +0000)]
added GAME_SSAMMO
added another column to gameinfo for the network filter name (gamename
for master server), and now replaces spaces with _ characters
automatically when using -customgamename, added
-customgamenetworkfiltername to override this if desired

this is necessary to resolve an issue where games whose names contain
spaces were not being supported by dpmaster

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12013 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f7d07d8eab555dd446483d77cf9465489a4cf0ec

11 years agorestore the wrapping behavior on tcMod scroll for compatibility reasons
havoc [Sat, 21 Sep 2013 18:30:38 +0000 (18:30 +0000)]
restore the wrapping behavior on tcMod scroll for compatibility reasons
(this matches Quake3 logic)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12012 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0efdb76a8237a96b860b88341f3b42fe5034e34e

11 years agosupport "declaring" particle effects at the top of the effectinfo file
divverent [Mon, 30 Sep 2013 19:52:54 +0000 (19:52 +0000)]
support "declaring" particle effects at the top of the effectinfo file

Now "effect EFFECTNAME" without any fields set is harmless; the slot it creates
will be used by a later "effect EFFECTNAME" definition.

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

11 years agoInitialize host_dirtytime.
divverent [Sun, 29 Sep 2013 11:47:50 +0000 (11:47 +0000)]
Initialize host_dirtytime.

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

11 years agofix several visual studio projects which did not have CONFIG_MENU added
havoc [Thu, 26 Sep 2013 23:27:19 +0000 (23:27 +0000)]
fix several visual studio projects which did not have CONFIG_MENU added

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

11 years agofix a typo
havoc [Thu, 26 Sep 2013 20:54:23 +0000 (20:54 +0000)]
fix a typo

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

11 years agoadded GAME_SSAMMO
havoc [Thu, 26 Sep 2013 20:47:40 +0000 (20:47 +0000)]
added GAME_SSAMMO
added another column to gameinfo for the network filter name (gamename
for master server), and now replaces spaces with _ characters
automatically when using -customgamename, added
-customgamenetworkfiltername to override this if desired

this is necessary to resolve an issue where games whose names contain
spaces were not being supported by dpmaster

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

11 years agorestore the wrapping behavior on tcMod scroll for compatibility reasons
havoc [Sat, 21 Sep 2013 18:30:38 +0000 (18:30 +0000)]
restore the wrapping behavior on tcMod scroll for compatibility reasons
(this matches Quake3 logic)

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

11 years agoGLX: Fix desktopfullscreen size when we actually switched to it.
divverent [Fri, 20 Sep 2013 07:22:34 +0000 (07:22 +0000)]
GLX: Fix desktopfullscreen size when we actually switched to it.

Should fix a few possible issues with getresolution(-1) on a multihead
setup with some window managers.

Also, remove a superfluous memory allocation on GLX when not using
DPSOFTRAST.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12011 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=21f2a75b80193c21c1e5458f531445b979f20454

11 years agoFix a compile error on win32 I introduced.
divverent [Fri, 20 Sep 2013 07:15:58 +0000 (07:15 +0000)]
Fix a compile error on win32 I introduced.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12010 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7033142b17600b88c273c2460678b386bf7051dd

11 years agoRework game specific hacks to have a special group for Nexuiz-derived games.
divverent [Thu, 19 Sep 2013 12:19:24 +0000 (12:19 +0000)]
Rework game specific hacks to have a special group for Nexuiz-derived games.

From: Rudolf Polzer <divverent@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12009 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=01f19c6c3ff8d4645b8589b3c8274d08a5775af6

11 years agoGame definitions for Vore Tournament
divverent [Thu, 19 Sep 2013 12:19:20 +0000 (12:19 +0000)]
Game definitions for Vore Tournament

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12008 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0a9cb13c130407234be6c297af3006258e90bf3d

11 years agoTEMPHACK_origin is no longer needed. Begone!
divverent [Thu, 19 Sep 2013 11:49:40 +0000 (11:49 +0000)]
TEMPHACK_origin is no longer needed. Begone!

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12007 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4cbebb927f4c6705d991608f61ed8e0f68d06f32

11 years agoGLX: Fix desktopfullscreen size when we actually switched to it.
divverent [Fri, 20 Sep 2013 07:22:34 +0000 (07:22 +0000)]
GLX: Fix desktopfullscreen size when we actually switched to it.

Should fix a few possible issues with getresolution(-1) on a multihead
setup with some window managers.

Also, remove a superfluous memory allocation on GLX when not using
DPSOFTRAST.

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

11 years agoFix a compile error on win32 I introduced.
divverent [Fri, 20 Sep 2013 07:15:58 +0000 (07:15 +0000)]
Fix a compile error on win32 I introduced.

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

11 years agoRework game specific hacks to have a special group for Nexuiz-derived games.
divverent [Thu, 19 Sep 2013 12:19:24 +0000 (12:19 +0000)]
Rework game specific hacks to have a special group for Nexuiz-derived games.

From: Rudolf Polzer <divverent@xonotic.org>

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

11 years agoGame definitions for Vore Tournament
divverent [Thu, 19 Sep 2013 12:19:20 +0000 (12:19 +0000)]
Game definitions for Vore Tournament

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

11 years agoTEMPHACK_origin is no longer needed. Begone!
divverent [Thu, 19 Sep 2013 11:49:40 +0000 (11:49 +0000)]
TEMPHACK_origin is no longer needed. Begone!

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

11 years agovid_desktopfullscreen improvements; allow querying the desktop mode
divverent [Wed, 18 Sep 2013 09:33:21 +0000 (09:33 +0000)]
vid_desktopfullscreen improvements; allow querying the desktop mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12006 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e32c37df7da8febe7fd6d5c97159b3fb01c14717

11 years agorename netwmfullscreen to desktopfullscreen; implement in other drivers (except agl)
divverent [Tue, 17 Sep 2013 19:38:35 +0000 (19:38 +0000)]
rename netwmfullscreen to desktopfullscreen; implement in other drivers (except agl)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12005 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ecfa97404a1e344f1617cca6a22863652cd9774e

11 years agoreworked tcmod to wrap shadertime every 9.1 hours (32768 seconds) rather
havoc [Tue, 17 Sep 2013 01:17:53 +0000 (01:17 +0000)]
reworked tcmod to wrap shadertime every 9.1 hours (32768 seconds) rather
than attempting to fixup precision issues in tcmod scroll, which was
breaking shaders that had other tcmod effects after tcmod scroll (or if
they used clampmap)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12004 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=5927c6f5fe5fd0fcd20072ce6679d9e1c7b4212e

11 years agoset world.absmin and world.absmax in csqc
havoc [Sun, 15 Sep 2013 18:54:47 +0000 (18:54 +0000)]
set world.absmin and world.absmax in csqc

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12003 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e0f6398b3b10f91918de43bac33ea3ca093d33c8

11 years agovid_desktopfullscreen improvements; allow querying the desktop mode
divverent [Wed, 18 Sep 2013 09:33:21 +0000 (09:33 +0000)]
vid_desktopfullscreen improvements; allow querying the desktop mode

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

11 years agorename netwmfullscreen to desktopfullscreen; implement in other drivers (except agl)
divverent [Tue, 17 Sep 2013 19:38:35 +0000 (19:38 +0000)]
rename netwmfullscreen to desktopfullscreen; implement in other drivers (except agl)

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

11 years agoreworked tcmod to wrap shadertime every 9.1 hours (32768 seconds) rather
havoc [Tue, 17 Sep 2013 01:17:53 +0000 (01:17 +0000)]
reworked tcmod to wrap shadertime every 9.1 hours (32768 seconds) rather
than attempting to fixup precision issues in tcmod scroll, which was
breaking shaders that had other tcmod effects after tcmod scroll (or if
they used clampmap)

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

11 years agoset world.absmin and world.absmax in csqc
havoc [Sun, 15 Sep 2013 18:54:47 +0000 (18:54 +0000)]
set world.absmin and world.absmax in csqc

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

11 years agoFix loading of common.LANGUAGE.po.
divverent [Thu, 12 Sep 2013 12:43:08 +0000 (12:43 +0000)]
Fix loading of common.LANGUAGE.po.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12002 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9772a3d686ff2cb9958dc3450bd23aca608c20d8

11 years agoFix loading of common.LANGUAGE.po.
divverent [Thu, 12 Sep 2013 12:43:08 +0000 (12:43 +0000)]
Fix loading of common.LANGUAGE.po.

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

11 years ago.po support: support common.<language>.po as secondary translation source independent...
divverent [Wed, 11 Sep 2013 14:58:18 +0000 (14:58 +0000)]
.po support: support common.<language>.po as secondary translation source independent from progs filename

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12001 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=668fc41f79b91c7c33baef71384a7c4f88d9a919

11 years agoremove this movetype from CSQC. How did it get there...
divverent [Thu, 29 Aug 2013 12:55:48 +0000 (12:55 +0000)]
remove this movetype from CSQC. How did it get there...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12000 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=75d7c43117740688f30a9ea432ea2638458457b0

11 years agosync dpdefs
divverent [Thu, 29 Aug 2013 12:40:35 +0000 (12:40 +0000)]
sync dpdefs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11999 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=385719b2c60565a899cacc94d315aae7bc6fbdd8

11 years ago.po support: support common.<language>.po as secondary translation source independent...
divverent [Wed, 11 Sep 2013 14:58:18 +0000 (14:58 +0000)]
.po support: support common.<language>.po as secondary translation source independent from progs filename

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

11 years agoremove this movetype from CSQC. How did it get there...
divverent [Thu, 29 Aug 2013 12:55:48 +0000 (12:55 +0000)]
remove this movetype from CSQC. How did it get there...

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

11 years agosync dpdefs
divverent [Thu, 29 Aug 2013 12:40:35 +0000 (12:40 +0000)]
sync dpdefs

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

11 years agofix bug in Crypto_RetrieveLocalKey
divverent [Thu, 22 Aug 2013 14:45:18 +0000 (14:45 +0000)]
fix bug in Crypto_RetrieveLocalKey

From: Jan Behrens <zykure@web.de>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11998 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fa69b3e45b5cf486826fcb9d5865159706c6f0e9

11 years agofix bug in Crypto_RetrieveLocalKey
divverent [Thu, 22 Aug 2013 14:45:18 +0000 (14:45 +0000)]
fix bug in Crypto_RetrieveLocalKey

From: Jan Behrens <zykure@web.de>

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

11 years agofix typo, sorry
divverent [Thu, 8 Aug 2013 10:15:09 +0000 (10:15 +0000)]
fix typo, sorry

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11997 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=07179d141ad100dd3f5cec7083b171bdfa96efd4

11 years agofix typo, sorry
divverent [Thu, 8 Aug 2013 10:15:09 +0000 (10:15 +0000)]
fix typo, sorry

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

11 years agoMake d0_rijndael library optional again.
divverent [Thu, 8 Aug 2013 09:42:21 +0000 (09:42 +0000)]
Make d0_rijndael library optional again.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11996 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e9b60787543c255b4d6b09c92602cbe63bea95d1

11 years agoMake d0_rijndael library optional again.
divverent [Thu, 8 Aug 2013 09:42:21 +0000 (09:42 +0000)]
Make d0_rijndael library optional again.

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

11 years agoIn prog reset functions, do not call functions unless prog->loaded.
divverent [Tue, 6 Aug 2013 13:40:35 +0000 (13:40 +0000)]
In prog reset functions, do not call functions unless prog->loaded.

This fixes segfaults in case progs loading itself may have caused Host_Error.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11995 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=97703839c970c295ba6173da463906bdec6d55cd

11 years agoIn prog reset functions, do not call functions unless prog->loaded.
divverent [Tue, 6 Aug 2013 13:40:35 +0000 (13:40 +0000)]
In prog reset functions, do not call functions unless prog->loaded.

This fixes segfaults in case progs loading itself may have caused Host_Error.

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

11 years agofix DP_FS_BASEDIR escaping
divverent [Sat, 3 Aug 2013 16:03:26 +0000 (16:03 +0000)]
fix DP_FS_BASEDIR escaping

From: Rudolf Polzer <divverent@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11994 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4f1a1c642316d2f85a4073eb969f962f24ed647b

11 years agofix DP_FS_BASEDIR escaping
divverent [Sat, 3 Aug 2013 16:03:26 +0000 (16:03 +0000)]
fix DP_FS_BASEDIR escaping

From: Rudolf Polzer <divverent@xonotic.org>

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

11 years agoFix name of CONFIG_VIDEO_CAPTURE macro.
divverent [Sat, 3 Aug 2013 12:48:23 +0000 (12:48 +0000)]
Fix name of CONFIG_VIDEO_CAPTURE macro.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11993 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=18eb1f68267407be6241a6ec5c3612788b153b20

11 years agoRevert "Revert "Build in subdirs"", as the issues seem to be ironed out now.
divverent [Sat, 3 Aug 2013 12:48:18 +0000 (12:48 +0000)]
Revert "Revert "Build in subdirs"", as the issues seem to be ironed out now.
Revert "Revert "Make cdda optional, server does not need to play music" because it", as its requirements are there now.
Do not include menu QC support in server builds.

Author: Nikoli

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11992 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=221a6cb74c3a3b30b9e60247d6e42d7a6fcdebf0

11 years agoaudit all uses of CL_ParticleEffect and CL_ParticleTrail and state box/trail intention
divverent [Mon, 29 Jul 2013 10:50:09 +0000 (10:50 +0000)]
audit all uses of CL_ParticleEffect and CL_ParticleTrail and state box/trail intention

Should fix Nexuiz.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11991 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=50fbadcbc923f9be4fa7623e60ffb23053a87dc4

11 years agoTreat attempts to draw trails with pointparticles as zero length trails.
divverent [Mon, 29 Jul 2013 10:50:06 +0000 (10:50 +0000)]
Treat attempts to draw trails with pointparticles as zero length trails.

This means they will get dlight, and count/countabsolute do get applied.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11990 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2e0f64a4030953216fc8a2ddb8edde7964446258