]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
11 years agoMerge remote-tracking branch 'origin/divVerent/lhnet_tcp' into IDWMaster/lobby_and_ch...
Brian Bosak [Mon, 12 Aug 2013 21:21:46 +0000 (16:21 -0500)]
Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into IDWMaster/lobby_and_chat_support

Conflicts:
console.c
lhnet.c
lhnet.h

11 years agoMake LHNET support TCP and SOME kind of use from other threads.
Rudolf Polzer [Mon, 12 Aug 2013 07:37:27 +0000 (09:37 +0200)]
Make LHNET support TCP and SOME kind of use from other threads.

Most LHNET functions are still unsafe from other threads, but it's good
enough now for blocking I/O from other threads.

11 years agolhnet: make STANDALONETEST actually work again
Rudolf Polzer [Mon, 12 Aug 2013 06:58:15 +0000 (08:58 +0200)]
lhnet: make STANDALONETEST actually work again

11 years agoShould be thread-safe now
Brian Bosak [Fri, 9 Aug 2013 19:18:30 +0000 (14:18 -0500)]
Should be thread-safe now

11 years agoAdded missing files
Brian Bosak [Fri, 9 Aug 2013 18:36:30 +0000 (13:36 -0500)]
Added missing files

11 years agoChanged name to be less egotistical
Brian Bosak [Fri, 9 Aug 2013 18:35:59 +0000 (13:35 -0500)]
Changed name to be less egotistical

11 years agoAdded IDWMaster_Loop for running code on main thraed
Brian Bosak [Fri, 9 Aug 2013 18:23:37 +0000 (13:23 -0500)]
Added IDWMaster_Loop for running code on main thraed

11 years agoIDWMaster gameroom feature added
Brian Bosak [Fri, 9 Aug 2013 17:11:42 +0000 (12:11 -0500)]
IDWMaster gameroom feature added

11 years agoAdded idwfind protocol support
Brian Bosak [Fri, 9 Aug 2013 16:58:22 +0000 (11:58 -0500)]
Added idwfind protocol support

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

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

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

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

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

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 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

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

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

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 "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

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

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 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

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 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

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

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 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

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

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

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

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

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 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

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 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

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

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

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

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

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

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

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

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

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 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

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 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

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

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 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

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 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

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

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

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

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

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

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

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

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

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