]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
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 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 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 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 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 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 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 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 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 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 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 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

11 years agocl_particles_forcetraileffects: emulate old trail behaviour (Xonotic 0.7 compatibility).
divverent [Sun, 28 Jul 2013 13:58:09 +0000 (13:58 +0000)]
cl_particles_forcetraileffects: emulate old trail behaviour (Xonotic 0.7 compatibility).

When this is set, trail effects are always drawn, even if a box is requested.

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

11 years agoadded FORCEGAME define for building an engine that runs a specific game
havoc [Sun, 28 Jul 2013 00:11:33 +0000 (00:11 +0000)]
added FORCEGAME define for building an engine that runs a specific game
regardless of executable name (this basically overrides the executable
name check)

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

11 years agofix an unused variable warning caused by USEODE
havoc [Sun, 28 Jul 2013 00:10:50 +0000 (00:10 +0000)]
fix an unused variable warning caused by USEODE

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

11 years agoRevert "Make cdda optional, server does not need to play music" because it
divverent [Sat, 27 Jul 2013 10:36:19 +0000 (10:36 +0000)]
Revert "Make cdda optional, server does not need to play music" because it
depends on having separate build directories. No hard feelings, Nikoli, when
separate build directories work again, feel free to revert this revert.

This reverts commit 97b79884ee55276e90c4dd60f9bfde8b9dbbff68.

Conflicts:
makefile.inc

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

11 years agoSeparate box and trail particles. Makes Xonotic's Nex beam possible again.
divverent [Sat, 27 Jul 2013 10:24:22 +0000 (10:24 +0000)]
Separate box and trail particles. Makes Xonotic's Nex beam possible again.

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

11 years agouse DP_LINK_ZLIB=dlopen on mingw build to reduce compile-time
havoc [Sat, 27 Jul 2013 09:29:35 +0000 (09:29 +0000)]
use DP_LINK_ZLIB=dlopen on mingw build to reduce compile-time
dependencies

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

11 years agofix effectinfo.txt trail effects which were honoring the (time-based)
havoc [Thu, 10 Jan 2013 05:36:54 +0000 (05:36 +0000)]
fix effectinfo.txt trail effects which were honoring the (time-based)
count parameter, trailspacing now completely overrides the count
parameter as was assumed by the previous change (11539) that passed time
as count, this only affected network entities (.traileffectnum or
.effects or .modelflags) but was clearly broken

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

11 years agoRevert "Build in subdirs"
divverent [Sat, 27 Jul 2013 10:06:26 +0000 (10:06 +0000)]
Revert "Build in subdirs"

This reverts commit f41e93d3e84e082d4728e3d6a9aadb3ca686a9b9.

Conflicts:
BSDmakefile
makefile.inc

From: Matthias Krüger <matthias.krueger@famsik.de>

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

11 years agoremoved modplug support, the library is too insecure and barely used by
havoc [Fri, 26 Jul 2013 19:01:50 +0000 (19:01 +0000)]
removed modplug support, the library is too insecure and barely used by
anyone

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

11 years agoMake cdda optional, server does not need to play music
nikoli [Fri, 26 Jul 2013 08:19:12 +0000 (08:19 +0000)]
Make cdda optional, server does not need to play music

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

11 years agoBuild in subdirs
nikoli [Fri, 26 Jul 2013 04:27:29 +0000 (04:27 +0000)]
Build in subdirs

Now this command works fine:
make cl-debug sdl-release sv-release-profile -j9

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

11 years agoUpdate build system, fix and enable ODE by default
nikoli [Wed, 24 Jul 2013 16:27:58 +0000 (16:27 +0000)]
Update build system, fix and enable ODE by default

Fixed crash when running in Hardened Gentoo with libode installed.
Fixed building and running with USEODE disabled.
Use same LINK_TO_NAME, LIB_NAME, CFLAGS_NAME style for dependencies.
Link to libz and libode by default.

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

11 years agoAdd ability to reproduce build
nikoli [Wed, 24 Jul 2013 16:13:57 +0000 (16:13 +0000)]
Add ability to reproduce build

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

11 years agomake clock_gettime default (since 2.6.28 it is NTP-adjusted)
divverent [Wed, 24 Jul 2013 11:44:30 +0000 (11:44 +0000)]
make clock_gettime default (since 2.6.28 it is NTP-adjusted)

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

11 years agofix alpha screenshots
divverent [Mon, 22 Jul 2013 14:47:00 +0000 (14:47 +0000)]
fix alpha screenshots

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

11 years agofix typo leading to DP_PHYSICS_ODE not being detectable
divverent [Mon, 22 Jul 2013 14:39:25 +0000 (14:39 +0000)]
fix typo leading to DP_PHYSICS_ODE not being detectable

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

11 years agoFix C++ typecast/linkage specification errors.
vortex [Sun, 21 Jul 2013 22:04:34 +0000 (22:04 +0000)]
Fix C++ typecast/linkage specification errors.

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

11 years agoSteel Storm additions for mobile (EluanCM)
havoc [Wed, 17 Jul 2013 05:44:37 +0000 (05:44 +0000)]
Steel Storm additions for mobile (EluanCM)
engine support for Android (EluanCM's port, some cleanup by Forest Hale)
engine support for iPhoneOS (Forest Hale)

credit: EluanCM, myself (Forest Hale)

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

11 years agomoved #include <SDL.h> above #include "quakedef.h"
havoc [Wed, 17 Jul 2013 04:07:25 +0000 (04:07 +0000)]
moved #include <SDL.h> above #include "quakedef.h"

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

11 years agofix an unused variable warning with USE_GLES2
havoc [Wed, 17 Jul 2013 04:05:48 +0000 (04:05 +0000)]
fix an unused variable warning with USE_GLES2

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

11 years agoadded #ifndef DP_MOBILETOUCH on the command history and ip logging
havoc [Wed, 17 Jul 2013 04:03:07 +0000 (04:03 +0000)]
added #ifndef DP_MOBILETOUCH on the command history and ip logging

credit: EluanCM

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

11 years agowe need to #include <SDL.h> before #include "quakedef.h"
havoc [Wed, 17 Jul 2013 04:00:01 +0000 (04:00 +0000)]
we need to #include <SDL.h> before #include "quakedef.h"

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

11 years agoCmd_ExecuteString now calls Cbuf_LockThreadMutex
havoc [Wed, 17 Jul 2013 03:59:09 +0000 (03:59 +0000)]
Cmd_ExecuteString now calls Cbuf_LockThreadMutex

credit: EluanCM

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

11 years agonew #define DP_FREETYPE_STATIC for compiling with freetype linked
havoc [Wed, 17 Jul 2013 03:54:31 +0000 (03:54 +0000)]
new #define DP_FREETYPE_STATIC for compiling with freetype linked
directly rather than runtime loaded

credit: EluanCM

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

11 years agoNew rate burst handling; cvars: cl_rate_burstsize, net_usesizelimit, net_burstreserve
divverent [Sat, 13 Jul 2013 10:15:35 +0000 (10:15 +0000)]
New rate burst handling; cvars: cl_rate_burstsize, net_usesizelimit, net_burstreserve

This supports some kind of packet size bursting to give better experience at
small rates. Can be controlled by the client.

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

11 years agoimplement curl --cachepic and curl --skinframe (experimental)
divverent [Mon, 8 Jul 2013 09:39:13 +0000 (09:39 +0000)]
implement curl --cachepic and curl --skinframe (experimental)

which can load textures from the web

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

11 years agofix a serious issue with CSQC frametime being non-zero on both calls
havoc [Sun, 7 Jul 2013 06:42:11 +0000 (06:42 +0000)]
fix a serious issue with CSQC frametime being non-zero on both calls
when using stereo rendering, it is now zero on the second eye so that
frametime does not lie

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

11 years agooops... fix nul termination. luckily not exploitable.
divverent [Sat, 29 Jun 2013 11:21:01 +0000 (11:21 +0000)]
oops... fix nul termination. luckily not exploitable.

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

11 years agoreenabled index buffers on GLES2 path
havoc [Thu, 27 Jun 2013 06:55:10 +0000 (06:55 +0000)]
reenabled index buffers on GLES2 path

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

11 years agofix severe (crashing) bugs with two calls to qglDrawElements when using
havoc [Thu, 27 Jun 2013 06:20:52 +0000 (06:20 +0000)]
fix severe (crashing) bugs with two calls to qglDrawElements when using
index buffers (this bug was hidden by gl_mesh_drawrangeelements being 1
by default)

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

11 years agoremove cvar gl_mesh_prefer_short_elements because many draw calls do not
havoc [Thu, 27 Jun 2013 05:57:31 +0000 (05:57 +0000)]
remove cvar gl_mesh_prefer_short_elements because many draw calls do not
even provide an element3i to use

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

11 years agoallow use of cvar gl_vbo_dynamicindex in RENDERPATH_GLES2
havoc [Thu, 27 Jun 2013 05:53:59 +0000 (05:53 +0000)]
allow use of cvar gl_vbo_dynamicindex in RENDERPATH_GLES2

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

11 years agofurther optimizations for gl_vbo_dynamicvertex and gl_vbo_dynamicindex
havoc [Wed, 19 Jun 2013 02:47:18 +0000 (02:47 +0000)]
further optimizations for gl_vbo_dynamicvertex and gl_vbo_dynamicindex

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

11 years agogl_vbo_dynamicvertex and gl_vbo_dynamicindex now use R_BufferData_Store
havoc [Wed, 19 Jun 2013 01:42:17 +0000 (01:42 +0000)]
gl_vbo_dynamicvertex and gl_vbo_dynamicindex now use R_BufferData_Store
rather than the much slower path they used before

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

11 years agosome cleanup of glDelete calls to guard against bugs caused by GL
havoc [Wed, 19 Jun 2013 01:27:59 +0000 (01:27 +0000)]
some cleanup of glDelete calls to guard against bugs caused by GL
changing the binding when we delete a currently active object

fix a major resource leak by calling R_FrameData_NewFrame and
R_BufferData_NewFrame earlier so that they work when disconnected

improved gl_vbostats output

clarify some logic related to r_batch_dynamicbuffer

don't bother destroying a temporary vertex buffer that we end up
destroying as part of the array cleanup

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

11 years agofix a critical bug with r_restart or vid_restart in R_BufferData_Reset
havoc [Tue, 18 Jun 2013 23:01:15 +0000 (23:01 +0000)]
fix a critical bug with r_restart or vid_restart in R_BufferData_Reset
where it did not properly reset all buffers

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

11 years agorenamed r_bufferdatasize_ cvars to r_buffermegs_ to give them new good
havoc [Tue, 18 Jun 2013 21:08:14 +0000 (21:08 +0000)]
renamed r_bufferdatasize_ cvars to r_buffermegs_ to give them new good
values, as the old cvar increase logic was badly bugged and would
arbitrarily increase them when not necessary

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

11 years agoremoved allowfail flag on R_BufferData_Store and made cvar management
havoc [Tue, 18 Jun 2013 20:51:30 +0000 (20:51 +0000)]
removed allowfail flag on R_BufferData_Store and made cvar management
more consistent, increased the buffer cycle to 3 frames

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

11 years agoimage_png: libpng16 support (by graphitemaster) xonotic-v0.7.0
divverent [Wed, 29 May 2013 16:53:08 +0000 (16:53 +0000)]
image_png: libpng16 support (by graphitemaster)

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

11 years agoImplement DSCP for ToS according to RFC2474 / RFC4594
divverent [Sat, 25 May 2013 14:08:53 +0000 (14:08 +0000)]
Implement DSCP for ToS according to RFC2474 / RFC4594

From: Merlijn Hofstra <merlijn@Merlijns-MacBook-Air.local>

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

11 years agoclarify the code when gl_mesh_prefer_short_elements is off
havoc [Wed, 22 May 2013 06:45:43 +0000 (06:45 +0000)]
clarify the code when gl_mesh_prefer_short_elements is off

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

11 years agoorder postprocess code properly (so blur does not cancel bloom)
divverent [Wed, 8 May 2013 10:41:01 +0000 (10:41 +0000)]
order postprocess code properly (so blur does not cancel bloom)

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

11 years agofix a floating around mutexattr object
divverent [Mon, 6 May 2013 09:54:55 +0000 (09:54 +0000)]
fix a floating around mutexattr object

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

11 years agofix a possible pthread crash
divverent [Mon, 6 May 2013 09:50:57 +0000 (09:50 +0000)]
fix a possible pthread crash

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

11 years agoVM_CL_findradius now uses World_EntitiesInBox as it should
havoc [Sun, 5 May 2013 04:04:34 +0000 (04:04 +0000)]
VM_CL_findradius now uses World_EntitiesInBox as it should

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

11 years agofix endless loop with gcc 4.8
divverent [Fri, 19 Apr 2013 09:40:43 +0000 (09:40 +0000)]
fix endless loop with gcc 4.8

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

11 years agoadd prvm_uint_t type
havoc [Wed, 17 Apr 2013 02:33:45 +0000 (02:33 +0000)]
add prvm_uint_t type

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

11 years agooptimized vm by using cached local variables instead of accessing prog->
havoc [Tue, 16 Apr 2013 22:51:33 +0000 (22:51 +0000)]
optimized vm by using cached local variables instead of accessing prog->
fields all the time

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

11 years agoadded prvm_uint_t for bounds check tests in the vm
havoc [Tue, 16 Apr 2013 22:17:09 +0000 (22:17 +0000)]
added prvm_uint_t for bounds check tests in the vm

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

11 years agoOPENGL_ORIENTATION -> MATRIX4x4_OPENGLORIENTATION
eihrul [Thu, 18 Apr 2013 17:30:25 +0000 (17:30 +0000)]
OPENGL_ORIENTATION -> MATRIX4x4_OPENGLORIENTATION

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

11 years agoset vid_stereobuffer cvar based on whether GL_STEREO is true after setting the mode
havoc [Wed, 17 Apr 2013 07:13:52 +0000 (07:13 +0000)]
set vid_stereobuffer cvar based on whether GL_STEREO is true after setting the mode

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

11 years agofix a severe texture corruption and crash case when using vid_dx9 1 is used with...
havoc [Wed, 17 Apr 2013 02:46:57 +0000 (02:46 +0000)]
fix a severe texture corruption and crash case when using vid_dx9 1 is used with vid_sRGB 1
work around a crash when using vid_dx9 1 with vid_stereobuffer 1 (this needs a better fix, D3D9 does not support this)
fix a warning in C++ where a bit flag mask was being passed as a bool

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

11 years agouse unsigned comparisons for most of the boundschecks in the vm
havoc [Tue, 16 Apr 2013 21:57:17 +0000 (21:57 +0000)]
use unsigned comparisons for most of the boundschecks in the vm

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

11 years agoipv6 dpmaster.sudo.rm-f.org has moved
divverent [Tue, 16 Apr 2013 08:51:32 +0000 (08:51 +0000)]
ipv6 dpmaster.sudo.rm-f.org has moved

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

11 years agoclarify a comment
havoc [Tue, 16 Apr 2013 03:24:09 +0000 (03:24 +0000)]
clarify a comment

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

11 years agowhen using engine particles (not effectinfo), prevent spawning particles
havoc [Tue, 16 Apr 2013 03:22:39 +0000 (03:22 +0000)]
when using engine particles (not effectinfo), prevent spawning particles
for EFFECT_EF_FLAME and EFFECT_EF_STARDUST when paused

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

11 years agofix two very ambiguous for loops that calculate camerawidth and
havoc [Tue, 16 Apr 2013 03:16:17 +0000 (03:16 +0000)]
fix two very ambiguous for loops that calculate camerawidth and
cameraheight

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

11 years agouse int not qboolean for glshaderversion
havoc [Tue, 16 Apr 2013 03:09:01 +0000 (03:09 +0000)]
use int not qboolean for glshaderversion

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

11 years agoRewritten SVQC stringbuffer saving routines (which is part of yet unfinished databuff...
vortex [Thu, 28 Mar 2013 20:24:13 +0000 (20:24 +0000)]
Rewritten SVQC stringbuffer saving routines (which is part of yet unfinished databuffers extension). Changes are backwards compatible with old savefile format. Now, once saved stringbuffers are found in extended savegame section, all string buffers allocated by worldspawn()/entityspawn (which is processed prior to savegame parsing) are deleted, and stringbuffers are restored from savegamefile with their original handles.

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

11 years agomove extension enables to the top of the shader to comply with spec
eihrul [Mon, 1 Apr 2013 15:58:00 +0000 (15:58 +0000)]
move extension enables to the top of the shader to comply with spec

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

11 years agoenable UBO extension for skeletal
eihrul [Mon, 1 Apr 2013 15:54:53 +0000 (15:54 +0000)]
enable UBO extension for skeletal

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

11 years agodisable depthfirst rendering on animated models since it doesn't work and should...
eihrul [Tue, 26 Mar 2013 22:19:01 +0000 (22:19 +0000)]
disable depthfirst rendering on animated models since it doesn't work and should theoretically have little performance benefit (and most likely performance detriment)

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

11 years agofix boneposerelative address
eihrul [Tue, 26 Mar 2013 21:01:54 +0000 (21:01 +0000)]
fix boneposerelative address

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

11 years agofactor out skeletal animation transform generation so that it can be reused
eihrul [Tue, 26 Mar 2013 19:34:00 +0000 (19:34 +0000)]
factor out skeletal animation transform generation so that it can be reused

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

11 years agoreworked the MOVETYPE_WALK and MOVETYPE_STEP sticking logic so that it
havoc [Sun, 24 Mar 2013 18:20:15 +0000 (18:20 +0000)]
reworked the MOVETYPE_WALK and MOVETYPE_STEP sticking logic so that it
only cares about world when deciding to be stuck, this means if you get
into a bmodel entity you can still move out of it

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

11 years agochanged MOVETYPE_STEP and MOVETYPE_WALK to match Quake behavior (unable
havoc [Sat, 2 Mar 2013 04:57:07 +0000 (04:57 +0000)]
changed MOVETYPE_STEP and MOVETYPE_WALK to match Quake behavior (unable
to move when allsolid - but also check SUPERCONTENTS_SOLID), this makes
hip2m3 shalrath work again

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

11 years agodon't call glGetUniformBlockIndex without GL_ARB_uniform_buffer_object
havoc [Tue, 5 Mar 2013 01:05:14 +0000 (01:05 +0000)]
don't call glGetUniformBlockIndex without GL_ARB_uniform_buffer_object
as the pointer is NULL (this crashed OpenGL 2.0-3.0 drivers)

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

11 years agorestrict which CHANNELFLAG_ values can be used in sound7 builtin, to
havoc [Sun, 3 Mar 2013 01:59:37 +0000 (01:59 +0000)]
restrict which CHANNELFLAG_ values can be used in sound7 builtin, to
keep qc from using internal-only ones

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

11 years agofix C++ compile error
havoc [Sat, 2 Mar 2013 00:42:01 +0000 (00:42 +0000)]
fix C++ compile error

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