]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
7 years agoMerge branch 'div0-stable' into Mario/advanced_chat Mario/advanced_chat
Mario [Sun, 12 Mar 2017 00:21:24 +0000 (10:21 +1000)]
Merge branch 'div0-stable' into Mario/advanced_chat

# Conflicts:
# console.c
# keys.c

7 years agoUse SDL 2.0.5 for Xonotic builds.
divverent [Wed, 8 Mar 2017 21:27:37 +0000 (21:27 +0000)]
Use SDL 2.0.5 for Xonotic builds.

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

7 years agor_coronas_occlusionquery: don't try using a GL20-requiring feature in the GL11/GL13...
divverent [Tue, 7 Mar 2017 19:12:17 +0000 (19:12 +0000)]
r_coronas_occlusionquery: don't try using a GL20-requiring feature in the GL11/GL13 render paths

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

7 years agoChat: accept K_KP_ENTER to end chat entry too.
divverent [Tue, 7 Mar 2017 18:33:54 +0000 (18:33 +0000)]
Chat: accept K_KP_ENTER to end chat entry too.

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

7 years agoadded separate cl_nopred cvar to use when playing on qw servers since
havoc [Sat, 14 Jan 2017 19:33:33 +0000 (19:33 +0000)]
added separate cl_nopred cvar to use when playing on qw servers since
players expect prediction in quakeworld, now cl_movement is only used on
dp6/dp7 servers.

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

7 years agoRemove a confusing part of the description of r_shadow_shadowmapping
havoc [Mon, 2 Jan 2017 03:06:22 +0000 (03:06 +0000)]
Remove a confusing part of the description of r_shadow_shadowmapping
cvar.

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

7 years agoChange darkplaces email address to darkplacesengine (on gmail) since
havoc [Mon, 2 Jan 2017 00:14:36 +0000 (00:14 +0000)]
Change darkplaces email address to darkplacesengine (on gmail) since
gmail has better spam filtering than the old host

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

7 years agoAdded an implementation of Lehmer random number generator with Lecuyer constant,...
havoc [Sun, 27 Nov 2016 21:45:11 +0000 (21:45 +0000)]
Added an implementation of Lehmer random number generator with Lecuyer constant, this is a simple mul128 based RNG with a period of 2^126.

Use the new RNG for bouncegrid traces to hopefully improve the photon distribution compared to lhcheeserandom.

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

7 years agoAdded developer_memorylargerthanmb cvar which prints (with developer 1) notices about...
havoc [Sun, 27 Nov 2016 20:59:04 +0000 (20:59 +0000)]
Added developer_memorylargerthanmb cvar which prints (with developer 1) notices about very large memory allocations (16MB and larger by default).

Slightly improved the Mem_Alloc out of memory error to include the size of the failed allocation.

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

7 years agoincrease MAX_CHANNELS to support quakemash
havoc [Sat, 7 Jan 2017 18:55:51 +0000 (18:55 +0000)]
increase MAX_CHANNELS to support quakemash

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

7 years agoTravis changes for Xonotic:
divverent [Wed, 11 Jan 2017 21:50:45 +0000 (21:50 +0000)]
Travis changes for Xonotic:

- Do not require root any more.
- Change the i386 build to build on Ubuntu directly, not in a chroot created using debootstrap.
- Remove the -isysroot option for OS X as the path broke after some Travis change.

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

7 years agoFix infinite loop that occurred in R_FrameData_Alloc if requesting > 256MB (which...
havoc [Sun, 27 Nov 2016 21:35:34 +0000 (21:35 +0000)]
Fix infinite loop that occurred in R_FrameData_Alloc if requesting > 256MB (which the per-chunk size was bounded to).

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

7 years agoFix one trace I missed when adding skipsupercontentsmask, and a couple other ones...
havoc [Sun, 27 Nov 2016 21:42:53 +0000 (21:42 +0000)]
Fix one trace I missed when adding skipsupercontentsmask, and a couple other ones in comments.

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

7 years agoAdd skipsupercontentsmask parameter to all the collision implementations, this allows...
havoc [Sun, 27 Nov 2016 21:29:12 +0000 (21:29 +0000)]
Add skipsupercontentsmask parameter to all the collision implementations, this allows you to ignore brushes/surfaces matching the specified contents flags, the primary use is ignoring q1bsp sky surfaces which are SUPERCONTENTS_SKY and SUPERCONTENTS_SOLID, since SUPERCONTENTS_SOLID is in the hitsupercontentsmask it will normally block on sky surfaces, but this way it will not if they also have SUPERCONTENTS_SKY set.

Use the new skipsupercontentsmask feature for bouncegrid traces and certain other light traces.

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

7 years agoAdded a MessageBox call in Sys_Error on Windows, matching the behavior of the wgl...
havoc [Sun, 27 Nov 2016 21:00:37 +0000 (21:00 +0000)]
Added a MessageBox call in Sys_Error on Windows, matching the behavior of the wgl client.  The typical error to desktop will be more informative now.

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

7 years agoEnable /LARGEADDRESSAWARE on win32 builds in MSVS2015, to get 3GB address space rathe...
havoc [Sun, 27 Nov 2016 20:51:15 +0000 (20:51 +0000)]
Enable /LARGEADDRESSAWARE on win32 builds in MSVS2015, to get 3GB address space rather than 2GB.

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

7 years agoAdded cl_bob_limit cvar which limits the maximum rage of view bobbing in a smooth...
havoc [Tue, 11 Oct 2016 01:05:53 +0000 (01:05 +0000)]
Added cl_bob_limit cvar which limits the maximum rage of view bobbing in a smooth way (rather than limiting the velocity and cl_bob independently, it limits the strength of the bob before the sinewave is applied).  By default this is 7 (inspired by the quake limit of +4 to -7 range).

Added cl_bob_limit_heightcheck cvar (off by default) which uses tracelines to limit the maximum value of cl_bob_limit based on the ceiling and floor height.

Added cl_bob_velocity_limit cvar which replaces the hard-coded 400 in a few places for xyspeed purposes.

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

7 years agoFix Q2BSP texture loading, Q2BSP contents issues, and add support for SURF_ALPHATEST...
havoc [Mon, 12 Sep 2016 05:13:44 +0000 (05:13 +0000)]
Fix Q2BSP texture loading, Q2BSP contents issues, and add support for SURF_ALPHATEST for any maps that might use it, force fullbright rendering on SURF_TRANS33/SURF_TRANS66/SURF_WARP textures which fixes the rain in 3v3gloom3.bsp and chainlink fence textures on tkse.bsp and glass transparency on gloom1se.bsp among others.  Also fix the SURF_FLOWING scroll rate when combined with SURF_WARP.

Also fixed the collision issues caused by stomping over Q1BSP data which caused traceline to break on Q1BSP after loading a Q2BSP map, thanks Supa for that bug report and finding other Q2BSP issues.

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

7 years agoAdded MSVC++ 2015 projects.
havoc [Sat, 10 Sep 2016 20:24:15 +0000 (20:24 +0000)]
Added MSVC++ 2015 projects.

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

7 years agoFix MSVC++ 2015 warnings about variable scope and some narrowing conversions without...
havoc [Sat, 10 Sep 2016 19:36:13 +0000 (19:36 +0000)]
Fix MSVC++ 2015 warnings about variable scope and some narrowing conversions without type casts.

Fix some missing type casts in recent r_shadow.c changes that didn't compile as C++ successfully.

Remove r_shadow_shadowmaplod variable which is unused.

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

7 years agoFix a typo in a field name.
havoc [Sun, 28 Aug 2016 07:08:50 +0000 (07:08 +0000)]
Fix a typo in a field name.

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

7 years agoAdded r_shadow_bouncegrid_lightpathsize which is an alternative to blur
havoc [Sun, 28 Aug 2016 05:29:09 +0000 (05:29 +0000)]
Added r_shadow_bouncegrid_lightpathsize which is an alternative to blur
- but in practice this is just slower at a value of 3 than 1 is with
  blur, so blur remains the default approach.

Implemented r_shadow_bouncegrid_floatcolors cvar which uses fp16 and
fp32 float formats to increase dynamic range.

Overhauled the default values of the bouncegrid cvars to look better.

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

7 years agoimplemented r_shadow_bouncegrid_blur, this tremendously improves
havoc [Sat, 27 Aug 2016 22:28:59 +0000 (22:28 +0000)]
implemented r_shadow_bouncegrid_blur, this tremendously improves
quality at a cost of processing time, eliminating many rounding error
problems in all levels.

renamed several r_shadow_bouncegrid_* cvars to have a dynamic prefix,
and split spacing so that it can also be different between
static/dynamic modes (static now uses 32).

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

7 years agoRefactored r_shadow_bouncegrid light splatting code, it now makes an
havoc [Sat, 27 Aug 2016 19:34:06 +0000 (19:34 +0000)]
Refactored r_shadow_bouncegrid light splatting code, it now makes an
array of light paths and then performs their splatting in a separate
step with an optional sort.

Implemented culling of out-of-view light paths in dynamic mode.

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

7 years agoRefactored r_shadow_bouncegrid code into several functions, changed
havoc [Sat, 27 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Refactored r_shadow_bouncegrid code into several functions, changed
photon distribution math to make the photons more stable from frame to
frame (in dynamic mode), the number of photons fired is now based on
r_shadow_bouncegrid_intensityperphoton rather than always going for
maximum photons (accordingly r_shadow_bouncegrid_photons has been
renamed maxphotons and will still apply the old logic if it must).

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

7 years agoFix a serious bug with r_shadow_bouncegrid_static where it used
havoc [Sat, 27 Aug 2016 03:17:49 +0000 (03:17 +0000)]
Fix a serious bug with r_shadow_bouncegrid_static where it used
R_CullBox and other view-dependent performance optimizations when
compiling the static texture - thanks to Vic for finding this bug!

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

7 years agokeys: do not send the text event of the toggleconsole bind to the console.
divverent [Tue, 29 Nov 2016 18:20:07 +0000 (18:20 +0000)]
keys: do not send the text event of the toggleconsole bind to the console.

This only affects SDL2's event handling, which sends events in the following order:

(keycode, 0, true)
(0, charcode, true)
(0, charcode, false)
(keycode, 0, false)

The input destination is toggled on the first event, and the console then would
receive the charcode events. Binds work differently though - their action is
queued into the console buffer, and executed at the end of the frame!

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

8 years agoSupport alpha textures in Quake if the name starts with '{'.
divverent [Thu, 18 Aug 2016 15:28:24 +0000 (15:28 +0000)]
Support alpha textures in Quake if the name starts with '{'.

Note: this is actually a HLBSP feature, though:

Author: ericw on irc.anynet.org

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

8 years agoAdd user defined movetypes extension
divverent [Thu, 18 Aug 2016 15:03:55 +0000 (15:03 +0000)]
Add user defined movetypes extension

From: Mario <mario@smbclan.net>

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

8 years agoDon't run MOVETYPE_NOCLIP physics asynchronously
divverent [Sat, 30 Jul 2016 00:20:55 +0000 (00:20 +0000)]
Don't run MOVETYPE_NOCLIP physics asynchronously

From: Mario <mario@smbclan.net>

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

8 years agoOOPS. Enable USE_RWOPS only on Android.
divverent [Wed, 20 Jul 2016 14:11:45 +0000 (14:11 +0000)]
OOPS. Enable USE_RWOPS only on Android.

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

8 years agoStop using bytes >= 128 in format strings. They break on Android.
divverent [Wed, 20 Jul 2016 13:13:40 +0000 (13:13 +0000)]
Stop using bytes >= 128 in format strings. They break on Android.

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

8 years agoFix the show-keyboard logic for non-Steel Storm by factoring out the Steel Storm...
divverent [Wed, 20 Jul 2016 13:13:30 +0000 (13:13 +0000)]
Fix the show-keyboard logic for non-Steel Storm by factoring out the Steel Storm specific code into generic code.

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

8 years agoMake the touch outline feature actually work.
divverent [Wed, 20 Jul 2016 13:13:20 +0000 (13:13 +0000)]
Make the touch outline feature actually work.

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

8 years agoAdd DP_FS_USERDIR macro consistent to DP_FS_BASEDIR.
divverent [Wed, 20 Jul 2016 13:13:10 +0000 (13:13 +0000)]
Add DP_FS_USERDIR macro consistent to DP_FS_BASEDIR.

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

8 years agoFile system: Android assets support.
divverent [Wed, 20 Jul 2016 13:13:00 +0000 (13:13 +0000)]
File system: Android assets support.

For this, we must use SDL_RWops for accessing packs (and files), so
let's emulate file descriptors using them.

The main catch is that SDL_RWops have no dup() equivalent, so we're
emulating that as well. Not particularly fast, but well...

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

8 years agoAdd another bug entry
havoc [Mon, 18 Jul 2016 03:42:16 +0000 (03:42 +0000)]
Add another bug entry

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

8 years agoRefactor DP_MACHINE logic in makefile and makefile.inc because it was
havoc [Mon, 18 Jul 2016 03:23:15 +0000 (03:23 +0000)]
Refactor DP_MACHINE logic in makefile and makefile.inc because it was
broken on mingw.

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

8 years agoFix an error detected by -Wnarrowing (~0 narrowing to unsigned char,
havoc [Mon, 18 Jul 2016 02:41:07 +0000 (02:41 +0000)]
Fix an error detected by  -Wnarrowing (~0 narrowing to unsigned char,
changed it to 0xFF)

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

8 years agoAdded a couple todo items related to pq_fullpitch
havoc [Sun, 17 Jul 2016 22:32:09 +0000 (22:32 +0000)]
Added a couple todo items related to pq_fullpitch

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

8 years agoAdded a couple bugs
havoc [Sun, 17 Jul 2016 22:31:29 +0000 (22:31 +0000)]
Added a couple bugs

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

8 years agoAdd a cvar net_sourceaddresscheck (default 1) to ignore connect replies from the...
divverent [Mon, 27 Jun 2016 12:49:37 +0000 (12:49 +0000)]
Add a cvar net_sourceaddresscheck (default 1) to ignore connect replies from the wrong host.

This fixes some existing easy connect takeover exploits (which can,
without this check, even attack local matches).

From: Rudolf Polzer <divVerent@xonotic.org>

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

8 years agoChanged master server IP addresses back to hostnames so they don't go
havoc [Wed, 16 Mar 2016 03:23:18 +0000 (03:23 +0000)]
Changed master server IP addresses back to hostnames so they don't go
stale.

Removed dead master servers.

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

8 years agoFix FTBFS on non-x86 architectures
divverent [Mon, 13 Jun 2016 19:04:37 +0000 (19:04 +0000)]
Fix FTBFS on non-x86 architectures

From: Timothy Pearson <kb9vqf@pearsoncomputing.net>

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

8 years agoSupport darkplaces.opt from local files too.
divverent [Mon, 25 Apr 2016 13:01:25 +0000 (13:01 +0000)]
Support darkplaces.opt from local files too.

If both are present, flags from both get prepended; the execution order is:
[attached darkplaces.opt] [local darkplaces.opt] [command-line flags]

Also added flags -noopt (don't parse darkplaces.opt) and -noselfpack (don't read attached pack).

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

8 years agoAdded darkplaces-osx-sdl launch script, this has been simplified since
havoc [Tue, 5 Apr 2016 03:18:33 +0000 (03:18 +0000)]
Added darkplaces-osx-sdl launch script, this has been simplified since
we don't support OSX 10.5 anymore (and thus do not have to worry about
broken x86_64 binary support).

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

8 years agoChange makefile.inc to use SDL2 by default rather than SDL1.2 - removed
havoc [Mon, 4 Apr 2016 22:18:51 +0000 (22:18 +0000)]
Change makefile.inc to use SDL2 by default rather than SDL1.2 - removed
sdl2-* targets since they are not needed now.

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

8 years agocl_collision: don't hit network entities of players who don't have a network entity...
divverent [Mon, 28 Mar 2016 13:54:51 +0000 (13:54 +0000)]
cl_collision: don't hit network entities of players who don't have a network entity (but rather a shared entity, i.e. a CSQC entity).

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

8 years agoSDL2 dropped i386 support, so stop compiling against that.
divverent [Mon, 14 Mar 2016 16:29:02 +0000 (16:29 +0000)]
SDL2 dropped i386 support, so stop compiling against that.

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

8 years agoXonotic's travis script: Build the Linux binaries against SDL 2.0.4.
divverent [Sun, 13 Mar 2016 01:38:00 +0000 (01:38 +0000)]
Xonotic's travis script: Build the Linux binaries against SDL 2.0.4.

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

8 years agoFix warning and MSVC build against SDL2.
divverent [Sat, 12 Mar 2016 15:24:01 +0000 (15:24 +0000)]
Fix warning and MSVC build against SDL2.

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

8 years agov_yshearing: Make the cvar take the max angle to apply the effect to; remove the...
divverent [Mon, 7 Mar 2016 21:36:27 +0000 (21:36 +0000)]
v_yshearing: Make the cvar take the max angle to apply the effect to; remove the in_pitch hack for this as it is no longer needed then.

This makes Y shearing mode actually useful together with higer FOV (less
noticeable distortion).

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

8 years agov_yshearing: Make view and input behave more like Duke Nukem 3D ;)
divverent [Fri, 4 Mar 2016 20:41:09 +0000 (20:41 +0000)]
v_yshearing: Make view and input behave more like Duke Nukem 3D ;)

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

8 years agoFix initial state of autocvars.
divverent [Sun, 7 Feb 2016 01:53:31 +0000 (01:53 +0000)]
Fix initial state of autocvars.

From: Rudolf Polzer <divverent@xonotic.org>

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

8 years agoRemoved leftovers from progid.
divverent [Sun, 7 Feb 2016 01:53:23 +0000 (01:53 +0000)]
Removed leftovers from progid.

Replaced static animatemodel_cache with dynamically allocated per prog
instance.

From: Grigorii Kasymov <kasymovga@xsmail.com>

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

8 years agoRemoved globaldefindex_progid field from cvar struct.
divverent [Sun, 7 Feb 2016 01:53:20 +0000 (01:53 +0000)]
Removed globaldefindex_progid field from cvar struct.

From: Grigorii Kasymov <kasymovga@xsmail.com>

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

8 years agoInitialize globalindex for autocvars with -1 to prevent prog corruption.
divverent [Sun, 7 Feb 2016 01:53:16 +0000 (01:53 +0000)]
Initialize globalindex for autocvars with -1 to prevent prog corruption.

From: Grigorii Kasymov <kasymovga@xsmail.com>

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

8 years agoUnbreak Nexuiz weapon animation.
divverent [Mon, 4 Jan 2016 18:20:35 +0000 (18:20 +0000)]
Unbreak Nexuiz weapon animation.

Nexuiz uses h_*.dpm models that are mostly vertex-less (there are 6 dummy ones)
and merely move bones in order to move around the first-person weapon.

This means that these models (or rather, their surface meshes) will be
considered "non-animated" by the rendering code, given their dummy vertices are
never moved by animations.

However, a function to build animation subframes lists from animation group
numbers - which is called by gettaginfo and similar functions that locate
attachment points - falsely looked at the isanimated flag of the surface mesh
to decide whether to really build the list of subframes or not - and this was
wrong, given that statically displayed models that do move tags/bones do exist!

This commit removes this use of the isanimated flag and treats models with
animated and non-animated surface mesh the same for purposes of animation frame
evaluation.

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

8 years agoUnbreak "make sv-nexuiz" and "make nexuiz".
divverent [Mon, 4 Jan 2016 14:45:52 +0000 (14:45 +0000)]
Unbreak "make sv-nexuiz" and "make nexuiz".

(There was a typo in the Makefile of this target since r11992).

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

8 years agoDocument DP_SV_DISABLECLIENTPREDICTION.
divverent [Mon, 28 Dec 2015 21:20:56 +0000 (21:20 +0000)]
Document DP_SV_DISABLECLIENTPREDICTION.

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

8 years agoNew feature: disableclientprediction == -1.
divverent [Mon, 28 Dec 2015 21:20:53 +0000 (21:20 +0000)]
New feature: disableclientprediction == -1.

This forces client prediction in cases DP's own client side prediction cannot
handle, in particular, in case of non-WALK movetypes on a player entity.

To be useful, this requires CSQC code to perform player prediction instead.

From: Mario <mario@smbclan.net>

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

8 years agoOops. Add more ifdeffery to the NvOptimus stuff :)
divverent [Thu, 26 Nov 2015 14:48:26 +0000 (14:48 +0000)]
Oops. Add more ifdeffery to the NvOptimus stuff :)

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

8 years agoFix prvm_leaktest - it now really supports references from globals.
divverent [Thu, 26 Nov 2015 14:47:11 +0000 (14:47 +0000)]
Fix prvm_leaktest - it now really supports references from globals.

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

8 years agoSet NvOptimusEnablement.
divverent [Thu, 26 Nov 2015 13:52:27 +0000 (13:52 +0000)]
Set NvOptimusEnablement.

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

8 years agoLeaktest: store longer allocation origins.
divverent [Tue, 24 Nov 2015 14:58:00 +0000 (14:58 +0000)]
Leaktest: store longer allocation origins.

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

8 years agoLeaktest: disable support for following target/targetname by default.
divverent [Tue, 24 Nov 2015 14:57:58 +0000 (14:57 +0000)]
Leaktest: disable support for following target/targetname by default.

Instead, mark any entities created during initialization as non-leaky.
This should solve everything that the targetname support was meant to
solve (namely info_notnull entities), but is more general (e.g. would
also work with Xonotic's killtarget/target2/target3/target4 and
target0/name of Doom 3).

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

8 years agoMake the number of frames used for initial settling configurable.
divverent [Tue, 24 Nov 2015 13:39:23 +0000 (13:39 +0000)]
Make the number of frames used for initial settling configurable.

Quake uses two frames, which should normally be good enough anyway. This
is mainly for mods that use more than 2 frames for initialization to
avoid some minor odd effects to clients that connect that early.

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

8 years agoFix a recent typo-fix :)
divverent [Tue, 24 Nov 2015 13:33:03 +0000 (13:33 +0000)]
Fix a recent typo-fix :)

This fixes the centering of the window on Windows by default.

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

8 years agoFix several warnings with gcc-5 and an error with mingw (where
havoc [Sun, 8 Nov 2015 19:33:00 +0000 (19:33 +0000)]
Fix several warnings with gcc-5 and an error with mingw (where
HAVE_CLOCKGETTIME was somehow being defined)

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

8 years agoFix a type issue where SDL_GLContext * was being used instead of
havoc [Sun, 8 Nov 2015 19:18:33 +0000 (19:18 +0000)]
Fix a type issue where SDL_GLContext * was being used instead of
SDL_GLContext, this did no harm as the variable is never used...

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

8 years agoSDL2: add clipboard support for all platforms.
divverent [Sat, 17 Oct 2015 22:36:06 +0000 (22:36 +0000)]
SDL2: add clipboard support for all platforms.

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

9 years agoRevert motorsep's change r12222.
havoc [Sat, 8 Aug 2015 04:32:55 +0000 (04:32 +0000)]
Revert motorsep's change r12222.

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

9 years ago+ Added support for Doom 3 entity spawnargs ("name" and "target0") to allow smoother...
motorsep [Thu, 6 Aug 2015 02:34:11 +0000 (02:34 +0000)]
+ Added support for Doom 3 entity spawnargs ("name" and "target0") to allow smoother mapping experience using DarkRadiant level editor

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

9 years agoFix SolutionDir)) typo in Debug builds using VS2012 and VS2013 projects, thanks to...
havoc [Sat, 3 Oct 2015 22:34:59 +0000 (22:34 +0000)]
Fix SolutionDir)) typo in Debug builds using VS2012 and VS2013 projects, thanks to Willis for repotting this.

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

9 years agoAdd darkplaces.rc to the vcxproj files for sdl, sdl2 and dedicated targets.
havoc [Sun, 9 Aug 2015 20:54:26 +0000 (20:54 +0000)]
Add darkplaces.rc to the vcxproj files for sdl, sdl2 and dedicated targets.

Changed the CompanyName in the darkplaces.rc to "DarkPlaces Contributors", also changed the icon line to better match the standard ICON line in new VS2013 projects in case that matters.

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

9 years agoFixed two compile issues with vid_sdl.c.
havoc [Sun, 9 Aug 2015 18:30:47 +0000 (18:30 +0000)]
Fixed two compile issues with vid_sdl.c.

Added support for SDL2 compilation in vs2010, vs2012, vs2013.

Changed the build directories for all vs2010, vs2012, vs2013 projects - they are now more consistent (output binaries go into SolutionDir, intermediate files have a fully qualified directory so they don't conflict between builds).

Audited and reduced differences between vs2010, vs2012, vs2013 projects.

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

9 years agoOops, should also have fixed the uses inside AdjustWindowBounds.
divverent [Mon, 3 Aug 2015 17:57:03 +0000 (17:57 +0000)]
Oops, should also have fixed the uses inside AdjustWindowBounds.

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

9 years agoAlso, rect shouldn't be a reference in AdjustWindowBounds but a pointer. Grr...
divverent [Mon, 3 Aug 2015 17:50:43 +0000 (17:50 +0000)]
Also, rect shouldn't be a reference in AdjustWindowBounds but a pointer. Grr...

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

9 years agoFix type of AdjustWindowBounds - this is C, not C++.
divverent [Mon, 3 Aug 2015 17:14:47 +0000 (17:14 +0000)]
Fix type of AdjustWindowBounds - this is C, not C++.

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

9 years agoOnly abort the move of a MOVETYPE_TOSS entity if it is actually supposed to
divverent [Mon, 3 Aug 2015 16:48:44 +0000 (16:48 +0000)]
Only abort the move of a MOVETYPE_TOSS entity if it is actually supposed to
stop moving.

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

9 years agoCompile with IPv6 support by default
divverent [Mon, 3 Aug 2015 16:25:36 +0000 (16:25 +0000)]
Compile with IPv6 support by default

Invert logic of SUPPORTIPV6 define by changing to NOSUPPORTIPV6.

Include commented-out entry in makefile to allow for disabling IPv6
support should the user be burdened by their operating system.

From: Jeremy Visser <jeremy@visser.name>

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

9 years agoColor code editing
divverent [Mon, 3 Aug 2015 16:24:24 +0000 (16:24 +0000)]
Color code editing

Console edit line: make the color code visible when the cursor is inside it and r_font_disable_freetype is 0

From: terencehill <piuntn@gmail.com>

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

9 years agoadjust window position and size to the available desktop area (= screen size adjusted...
divverent [Mon, 3 Aug 2015 16:22:14 +0000 (16:22 +0000)]
adjust window position and size to the available desktop area (= screen size adjusted by taskbar location and size)

From: hbeham <horst@beham.biz>

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

9 years ago+ Added a new game, Steel Storm: Revenants
motorsep [Sun, 19 Jul 2015 21:13:29 +0000 (21:13 +0000)]
+ Added a new game, Steel Storm: Revenants

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

9 years agoq1bsp: Warn if a texture has an altframe but no frame.
divverent [Tue, 16 Jun 2015 19:59:01 +0000 (19:59 +0000)]
q1bsp: Warn if a texture has an altframe but no frame.

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

9 years agoq1bsp: Warn if an animated texture has exactly one frame.
divverent [Tue, 16 Jun 2015 19:58:57 +0000 (19:58 +0000)]
q1bsp: Warn if an animated texture has exactly one frame.

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

9 years agoq1bsp: Only warn once per "bad animating texture".
divverent [Tue, 16 Jun 2015 19:58:53 +0000 (19:58 +0000)]
q1bsp: Only warn once per "bad animating texture".

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

9 years agoFix an annoying bug in the d0_blind_id protocol handling: xonotic-v0.8.1
divverent [Tue, 25 Aug 2015 01:27:49 +0000 (01:27 +0000)]
Fix an annoying bug in the d0_blind_id protocol handling:

If a server uses the protocol but is not signed, the code previously did
not let a client connect to the server more than once per instance.

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

9 years agoAdded MSVC++ 2013 projects, fixed a casting issue in C++ compilation of r_shadow.c.
havoc [Sat, 6 Jun 2015 04:17:56 +0000 (04:17 +0000)]
Added MSVC++ 2013 projects, fixed a casting issue in C++ compilation of r_shadow.c.

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

9 years agoAdd a cvar: r_water_cameraentitiesonly.
divverent [Mon, 1 Jun 2015 09:40:54 +0000 (09:40 +0000)]
Add a cvar: r_water_cameraentitiesonly.

If set, water-style effects are only allowed when CL_VM_TransformView
would be called (in other words, for CSQC-generated cameras/portals).

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

9 years agoAdd a cvar: r_shadow_realtime_world_importlightentitiesfrommap
divverent [Sat, 21 Mar 2015 22:09:26 +0000 (22:09 +0000)]
Add a cvar: r_shadow_realtime_world_importlightentitiesfrommap

0: Never import lights from the .bsp/.ent file on map load.
1: Import lights from the .bsp/.ent file on map load if no rtlights are present.
2: Always use the .bsp/.ent's light entities, ignore rtlights files.

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

9 years agoFix a crash when playing q2bsp maps where t->currentframe is dereferenced, and it...
havoc [Fri, 20 Mar 2015 06:43:08 +0000 (06:43 +0000)]
Fix a crash when playing q2bsp maps where t->currentframe is dereferenced, and it is a dangling pointer that was left corrupt by the loader - fixed that as well.

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

9 years agoLimit number of particles created at once.
divverent [Tue, 10 Mar 2015 10:45:32 +0000 (10:45 +0000)]
Limit number of particles created at once.

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

9 years agoTE_EXPLOSION2: don't crash on colorLength == 0.
divverent [Mon, 9 Mar 2015 13:59:44 +0000 (13:59 +0000)]
TE_EXPLOSION2: don't crash on colorLength == 0.

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

9 years agoFix a curl-related hang when exiting.
divverent [Mon, 9 Mar 2015 11:24:27 +0000 (11:24 +0000)]
Fix a curl-related hang when exiting.

Fix a NULL crash when creating a sound without a worldmodel (harmless
NULL, but exploitable by svc_disconnect svc_sound in a single packet).

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

9 years ago::stable-branch::reset=704d101890948f0f496ce4fe73be523137c62117
Rudolf Polzer [Fri, 6 Mar 2015 20:36:12 +0000 (21:36 +0100)]
::stable-branch::reset=704d101890948f0f496ce4fe73be523137c62117

9 years agoFix rephrased altstr code.
divverent [Thu, 5 Mar 2015 12:27:18 +0000 (12:27 +0000)]
Fix rephrased altstr code.

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

9 years agoFix warnings.
divverent [Thu, 5 Mar 2015 12:27:16 +0000 (12:27 +0000)]
Fix warnings.

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

9 years agoRephrase VM_altstr_prepare to no longer annoy Coverity.
divverent [Thu, 5 Mar 2015 12:15:43 +0000 (12:15 +0000)]
Rephrase VM_altstr_prepare to no longer annoy Coverity.

(I think the previous code had no bug, but was hard to follow)

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

9 years agoFix a coverity false positive.
divverent [Thu, 5 Mar 2015 11:26:10 +0000 (11:26 +0000)]
Fix a coverity false positive.

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