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

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

projects / xonotic / darkplaces.git / log

havoc [Tue, 3 May 2011 00:59:44 +0000 (00:59 +0000)]

fix two compile errors in C++ mode

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 00:59:01 +0000 (00:59 +0000)]

fix two bugs with the Windows handling of GAMEDIRMODE_SAVEDGAMES, it now works properly

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

commit | commitdiff | tree

vortex [Mon, 2 May 2011 02:09:59 +0000 (02:09 +0000)]

Transparent sorting: added maxdist and array size cvars which can be tweaked to increase performance (can give up to 10-20% with no quality loss on scenes with large amount of blended surfaces). Added "dpnortlight" shader keyword which disables full rtlight rendering on a surface, useful with grass which (when blended) can cause deadly speed loss.

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

commit | commitdiff | tree

divverent [Sun, 1 May 2011 20:24:33 +0000 (20:24 +0000)]

shells are too stupid to understand precedence of && and ||, so let's group explicitly

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

commit | commitdiff | tree

havoc [Sun, 1 May 2011 20:23:49 +0000 (20:23 +0000)]

fix a compile error in my last edit for OSX

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

commit | commitdiff | tree

havoc [Sun, 1 May 2011 20:05:17 +0000 (20:05 +0000)]

don't override dock icon on OSX

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

commit | commitdiff | tree

divverent [Sun, 1 May 2011 18:58:04 +0000 (18:58 +0000)]

detect git revision too, not just svn version

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

commit | commitdiff | tree

havoc [Sun, 1 May 2011 16:33:10 +0000 (16:33 +0000)]

reworked userdir path selection, now has 4 "tiers":
NOHOME - uses basedir for configs
HOME - uses basedir on Windows, ~/.gamename/ on OSX and Linux
MYGAMES - uses My Games on Windows, ~/.gamename/ on Linux and OSX
SAVEDGAMES - uses Saved Games/gamename/ on Vista+, ~/.gamename/ on Linux
and ~/Library/Application Support/gamename/ on OSX
The tiers are tried in reverse order and any existing one will be used,
new ones will always be the last one.
If gamedirname1 is "id1" then Windows will use NOHOME rather than create
a new userdir when none are found. (but you can still create one or use
-mygames or -savedgames commandline options to make it do so)

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

commit | commitdiff | tree

havoc [Fri, 29 Apr 2011 08:07:37 +0000 (08:07 +0000)]

on OSX use ~/Library/Application Support/<gamename> instead of ~/.gamename

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

commit | commitdiff | tree

divverent [Fri, 29 Apr 2011 20:32:35 +0000 (20:32 +0000)]

CL_RotateMoves: helper builtin for Xonotic for perfect warpzone prediction

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

commit | commitdiff | tree

havoc [Fri, 29 Apr 2011 08:09:43 +0000 (08:09 +0000)]

changed vid_hasfocus check to use SDL_APPINPUTFOCUS only, not checking
SDL_APPMOUSEFOCUS

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

commit | commitdiff | tree

havoc [Fri, 29 Apr 2011 08:06:37 +0000 (08:06 +0000)]

refactored the SDL_WM_SetCaption and SDL_WM_SetIcon logic into a single
wrapper function for each platform (VID_WrapSDL_SetVideoMode), moved
caption setting before SDL_SetVideoMode to prevent the "SDL_app" title

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

commit | commitdiff | tree

divverent [Wed, 27 Apr 2011 10:50:48 +0000 (10:50 +0000)]

use highp by default

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

commit | commitdiff | tree

divverent [Wed, 27 Apr 2011 10:50:48 +0000 (10:50 +0000)]

use highp by default

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

commit | commitdiff | tree

divverent [Wed, 27 Apr 2011 10:35:15 +0000 (10:35 +0000)]

do NOT use mediump explicitly for GLSL130 because this seems incompatible with inout

0(97) : error C7538: OpenGL does not allow 'mediump' after 'inout'

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

commit | commitdiff | tree

divverent [Wed, 27 Apr 2011 09:19:10 +0000 (09:19 +0000)]

in glsl130, add "precision mediump float"

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

commit | commitdiff | tree

havoc [Wed, 27 Apr 2011 01:54:45 +0000 (01:54 +0000)]

added r_transparent cvar to turn off transparent rendering for
performance testing
added r_deformvertexes cvar to turn off deforms for performance testing
neither of these settings are meant to be performance improvements, only
testing methods

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

commit | commitdiff | tree

divverent [Mon, 25 Apr 2011 19:15:53 +0000 (19:15 +0000)]

evaluate sv_curl_serverpackages changes immediately, not on map restart

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

commit | commitdiff | tree

vortex [Sat, 23 Apr 2011 00:40:44 +0000 (00:40 +0000)]

R_LightPoint: fix glitch. Add checking for worldmodel->lit to R_LightPoint and R_CompleteLightPoint.

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

commit | commitdiff | tree

divverent [Wed, 20 Apr 2011 14:01:29 +0000 (14:01 +0000)]

really fix csprogs.dat.??.po loading

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

commit | commitdiff | tree

divverent [Wed, 20 Apr 2011 13:56:53 +0000 (13:56 +0000)]

do NOT use the crc inside the file name for .po file loading

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

commit | commitdiff | tree

divverent [Wed, 20 Apr 2011 07:32:01 +0000 (07:32 +0000)]

fix compile failure in crypto.c

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

commit | commitdiff | tree

havoc [Tue, 19 Apr 2011 18:15:09 +0000 (18:15 +0000)]

fix a comment about ftransform

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

commit | commitdiff | tree

divverent [Tue, 19 Apr 2011 15:31:26 +0000 (15:31 +0000)]

crypto: avoid generating control-like packets

In non-AES mode, we now replace packets whose hash starts with FFFFFFFF by
7FFFFFFF, and 8000LLLL by 0000LLLL. When decoding, packets with these prefixes
have two attempts.

AES encrypted mode is unaffected by this, as there packets always start with a
byte from 00 to 0F.

Also, no longer whine about receiving packets that fail the HMAC test when the
packets look like control packets (the NQ CONNECT packet DP sends when
connecting sometimes was received in time for this to match).

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

commit | commitdiff | tree

havoc [Mon, 18 Apr 2011 16:16:15 +0000 (16:16 +0000)]

disabled glBegin, glEnd, glPolygonMode wrapper functions in GLES2 init
because the r_showtris/r_shownormals code now checks if these are NULL

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

commit | commitdiff | tree

havoc [Mon, 18 Apr 2011 16:09:41 +0000 (16:09 +0000)]

added RENDERPATH_GLES1

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

commit | commitdiff | tree

havoc [Mon, 18 Apr 2011 16:07:13 +0000 (16:07 +0000)]

fix typo in last commit

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

commit | commitdiff | tree

havoc [Mon, 18 Apr 2011 15:38:32 +0000 (15:38 +0000)]

move iphone detection above macosx detection

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

commit | commitdiff | tree

havoc [Mon, 18 Apr 2011 15:35:46 +0000 (15:35 +0000)]

separate out the GLES2 stuff from the iphone stuff

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

commit | commitdiff | tree

divverent [Tue, 19 Apr 2011 16:32:54 +0000 (16:32 +0000)]

fix a segfault in menu routing when switching gamedirs

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

commit | commitdiff | tree

divverent [Tue, 19 Apr 2011 16:32:51 +0000 (16:32 +0000)]

fix a bug in cvar hash handling

causing loadconfig to mess up cvar hashing

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

commit | commitdiff | tree

havoc [Sun, 17 Apr 2011 20:05:27 +0000 (20:05 +0000)]

made r_showoverdraw honor material face culling settings

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

commit | commitdiff | tree

havoc [Sun, 17 Apr 2011 18:22:30 +0000 (18:22 +0000)]

added r_showoverdraw cvar which allows you to see how many draws per
pixel, white = 8 surfaces on the pixel (can be varied by changing cvar
to 0.5 or similar)

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

commit | commitdiff | tree

havoc [Sun, 17 Apr 2011 18:07:58 +0000 (18:07 +0000)]

fix cullentities trace on q1bsp, it was broken by the
TraceLineAgainstSurfaces patch

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

commit | commitdiff | tree

havoc [Thu, 14 Apr 2011 17:33:02 +0000 (17:33 +0000)]

undo an accidental r_test commit in vid_sdl.c

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

commit | commitdiff | tree

divverent [Wed, 13 Apr 2011 19:24:39 +0000 (19:24 +0000)]

make dpoffsetscale apply again

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

commit | commitdiff | tree

divverent [Wed, 13 Apr 2011 17:05:59 +0000 (17:05 +0000)]

fix a typo causing moire with offsetmapping

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

commit | commitdiff | tree

divverent [Wed, 13 Apr 2011 16:07:26 +0000 (16:07 +0000)]

new cvar: r_glsl_offsetmapping_reliefmapping_refinesteps (default 5)

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

commit | commitdiff | tree

divverent [Tue, 12 Apr 2011 20:34:40 +0000 (20:34 +0000)]

fix loading "g"-less .obj files

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

commit | commitdiff | tree

divverent [Tue, 12 Apr 2011 20:05:04 +0000 (20:05 +0000)]

avoid some crashes when recursing BIHs

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

commit | commitdiff | tree

havoc [Tue, 12 Apr 2011 14:10:10 +0000 (14:10 +0000)]

fix a typo

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

commit | commitdiff | tree

divverent [Tue, 12 Apr 2011 05:12:58 +0000 (05:12 +0000)]

oops, fix last fix

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

commit | commitdiff | tree

divverent [Tue, 12 Apr 2011 04:53:57 +0000 (04:53 +0000)]

fix an engine crash in vid_glx

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

commit | commitdiff | tree

divverent [Mon, 11 Apr 2011 06:51:56 +0000 (06:51 +0000)]

fix mingw breakage on Ubuntu

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

commit | commitdiff | tree

havoc [Mon, 11 Apr 2011 05:18:12 +0000 (05:18 +0000)]

remove the never-finished first incarnation of obj loading code, the
second incarnation is alive and well

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

commit | commitdiff | tree

divverent [Sun, 10 Apr 2011 19:23:57 +0000 (19:23 +0000)]

fix compilation of dpsoftrast on mingw32 (use Interlocked* instead of __sync_*)

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

commit | commitdiff | tree

divverent [Sun, 10 Apr 2011 19:07:28 +0000 (19:07 +0000)]

break the net connection AFTER calling ClientDisconnect; this fixes issues with clienttype(self) in ClientDisconnect

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

commit | commitdiff | tree

havoc [Sun, 10 Apr 2011 16:00:21 +0000 (16:00 +0000)]

don't infinite loop if a sound has total_length 0

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

commit | commitdiff | tree

havoc [Sun, 10 Apr 2011 12:50:11 +0000 (12:50 +0000)]

implemented support for GL_EXT_texture_sRGB to preserve precision if
supported (otherwise it just converts to linear and uses regular texture
formats)
renamed r_texture_convertsRGB_ cvars to r_texture_sRGB_ and broke out
the individual skin textures as separate cvars
added vid.forcetextype which allows particular renderpaths to force
desired texture component layouts (GL_RGBA for GLES, otherwise GL_BGRA)

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

commit | commitdiff | tree

havoc [Sat, 9 Apr 2011 17:11:18 +0000 (17:11 +0000)]

correct a cvar comment now that directional shading uses 8x data

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

commit | commitdiff | tree

havoc [Sat, 9 Apr 2011 17:09:18 +0000 (17:09 +0000)]

redesigned r_shadow_bouncegrid_static_directionalshading - it now uses 6
vectors per pixel instead of 3, giving much more accurate shading
added r_shadow_bouncegrid_includedirectlighting cvar - if turned on this
enables direct lighting in the bouncegrid
cleaned up directionalshading code significantly

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

commit | commitdiff | tree

havoc [Fri, 8 Apr 2011 15:23:10 +0000 (15:23 +0000)]

rewrote mod_collision_bih tracing code, the functions are no longer
recursive (small speed boost), line traces are about 12% faster due to
more precise culling of leafs (the code is however huge and nasty), BIH
TraceBrush is now considerably faster due to the same techniques, it was
previously very unoptimized

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

commit | commitdiff | tree

divverent [Sun, 10 Apr 2011 05:26:56 +0000 (05:26 +0000)]

fix the same bugs as before in strireplace

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

commit | commitdiff | tree

divverent [Sun, 10 Apr 2011 05:21:59 +0000 (05:21 +0000)]

r_showsurfaces 3: render sky (appears as average-colored box sides)

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

commit | commitdiff | tree

havoc [Sat, 9 Apr 2011 04:17:36 +0000 (04:17 +0000)]

don't use GL_RGBA internalformat on opaque textures (thanks to Rock for
reporting this bug)

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

commit | commitdiff | tree

divverent [Fri, 8 Apr 2011 17:49:18 +0000 (17:49 +0000)]

clang has _mm_cvtss_f32 but not __builtin_ia32_vec_ext_v4sf

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

commit | commitdiff | tree

havoc [Fri, 8 Apr 2011 16:10:44 +0000 (16:10 +0000)]

when loading q1bsp textures, do not allow q3 shader loading to overwrite
default parameters

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

commit | commitdiff | tree

havoc [Fri, 8 Apr 2011 16:38:11 +0000 (16:38 +0000)]

some cleanup of offsetmapping setup code

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

commit | commitdiff | tree

havoc [Fri, 8 Apr 2011 16:37:50 +0000 (16:37 +0000)]

added mod_noshader_default_offsetmapping to allow separate control over
external textures that have no q3 shader

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

commit | commitdiff | tree

divverent [Wed, 6 Apr 2011 20:24:30 +0000 (20:24 +0000)]

fix multiple bugs in strreplace

bug 1: if search string is empty, an endless loop occurs
bug 2: searching for "foo" in "fo" is actually found, and replaced!

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

commit | commitdiff | tree

eihrul [Wed, 6 Apr 2011 16:37:31 +0000 (16:37 +0000)]

more concise version of Texture2DBGRA8

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

commit | commitdiff | tree

divverent [Wed, 6 Apr 2011 16:32:03 +0000 (16:32 +0000)]

implement MODE_WATER

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

commit | commitdiff | tree

divverent [Wed, 6 Apr 2011 16:32:00 +0000 (16:32 +0000)]

make MODE_REFRACTION not use TEXCOORD1..3 to help MODE_WATER use the same code

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

commit | commitdiff | tree

divverent [Wed, 6 Apr 2011 15:26:08 +0000 (15:26 +0000)]

preparation for MODE_WATER: refactor the pixel getting out of MODE_REFRACTION

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

commit | commitdiff | tree

eihrul [Tue, 5 Apr 2011 18:40:01 +0000 (18:40 +0000)]

use ASYNCBLIT by default

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

commit | commitdiff | tree

divverent [Tue, 5 Apr 2011 18:06:10 +0000 (18:06 +0000)]

make vid_glx also clear fullscreen properly

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

commit | commitdiff | tree

divverent [Tue, 5 Apr 2011 17:41:10 +0000 (17:41 +0000)]

only use ONE buffer for non-Xshm

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

commit | commitdiff | tree

divverent [Tue, 5 Apr 2011 17:28:32 +0000 (17:28 +0000)]

sanity check the visual obtained

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

commit | commitdiff | tree

divverent [Tue, 5 Apr 2011 17:19:56 +0000 (17:19 +0000)]

XShm and pthreads support for vid_glx dpsoftrast

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

commit | commitdiff | tree

eihrul [Tue, 5 Apr 2011 08:57:38 +0000 (08:57 +0000)]

workaround for missing _mm_cvtss_f32 on some gcc versionsx

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

commit | commitdiff | tree

havoc [Tue, 5 Apr 2011 07:51:52 +0000 (07:51 +0000)]

added backface culling optimization to cl_decals_newsystem, this helps
in many cases

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

commit | commitdiff | tree

eihrul [Mon, 4 Apr 2011 21:21:49 +0000 (21:21 +0000)]

optimize scanning for 0 alpha in FinishBGRA8

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

commit | commitdiff | tree

eihrul [Mon, 4 Apr 2011 20:21:15 +0000 (20:21 +0000)]

FinishBGRA8 optimization and fixes

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

commit | commitdiff | tree

eihrul [Mon, 4 Apr 2011 19:51:25 +0000 (19:51 +0000)]

fix some clipping plane bugs and FinishBGRA8 bug introduced in r11015

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

commit | commitdiff | tree

havoc [Mon, 4 Apr 2011 15:47:46 +0000 (15:47 +0000)]

removed unused function DPSOFTRAST_Draw_Span_Finish
refactored parts of DPSOFTRAST_Draw_ProcessSpans into two functions -
DPSOFTRAST_Draw_DepthTest and DPSOFTRAST_Draw_DepthWrite
moved stack variable pixelmask to thread->pixelmaskarray
added depthbase and depthslope to span structure, computed at creation

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

commit | commitdiff | tree

eihrul [Mon, 4 Apr 2011 14:53:06 +0000 (14:53 +0000)]

clipplane validation fix

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

commit | commitdiff | tree

havoc [Mon, 4 Apr 2011 14:41:28 +0000 (14:41 +0000)]

added simple affine check to accelerate texture fetches on 2D art

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

commit | commitdiff | tree

eihrul [Mon, 4 Apr 2011 14:31:32 +0000 (14:31 +0000)]

initial support for user clipping plane in dpsoftrast

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

commit | commitdiff | tree

havoc [Mon, 4 Apr 2011 12:30:15 +0000 (12:30 +0000)]

changed pixelmask processing in DPSOFTRAST_Draw_Span_FinishBGRA8 to
clear pixelmask values when doing alphablend if the pixels have zero
alpha, and also to use a double loop approach which removes the checks
from the blending inner loops... this seems to have only a slight fps
gain in Quake though

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

commit | commitdiff | tree

divverent [Fri, 1 Apr 2011 23:07:04 +0000 (23:07 +0000)]

very basic softrast support in vid_glx.c. VERY SLOW, as it doesn't use an Xtension yet.

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 09:40:57 +0000 (09:40 +0000)]

added GL_Finish function in backend, to centralize all the qglFinish
calls and accommodate other render paths in such cases

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 08:42:00 +0000 (08:42 +0000)]

make r_hdr behave like r_bloom when r_viewfbo is on

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 08:11:16 +0000 (08:11 +0000)]

added support for dpsoftrast synchronization for fpsscaling

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 07:09:51 +0000 (07:09 +0000)]

changed default r_viewscale_fpsscaling_min from 0.25 (25% pixels, 50%
width/height) to 0.0625 (6.25% pixels, 25% width/height)

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 07:06:28 +0000 (07:06 +0000)]

changed default r_viewscale_fpsscaling_target from 90 to 70, this still
works well with vid_vsync

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 07:04:58 +0000 (07:04 +0000)]

reworked r_viewscale_fpsscaling to use the time of SCR_DrawScreen
wrapped in glFinish calls (REALLY should use GL_EXT_timery_query), this
means that vid_vsync now works fine with it

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 05:46:28 +0000 (05:46 +0000)]

added r_viewscale_fpsscaling and various cvars for it, this enables
variable resolution rendering based on framerate (does not work properly
with vsync)

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 01:04:12 +0000 (01:04 +0000)]

r_viewscale now works (with or without r_viewfbo), this allows reduced
resolution rendering for higher performance, at native screen
resolutions

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

commit | commitdiff | tree

havoc [Thu, 31 Mar 2011 23:58:16 +0000 (23:58 +0000)]

fixed viewsize issues with r_viewfbo

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

commit | commitdiff | tree

havoc [Thu, 31 Mar 2011 13:17:15 +0000 (13:17 +0000)]

added r_viewfbo and r_viewscale cvars - the former allows use of
GL_RGBA16F and GL_RGBA32F framebuffer rendering for 3D views (the main
refresh is not altered), the latter will allow scaling view rendering
resolution independently of video resolution, when implemented

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

commit | commitdiff | tree

eihrul [Sat, 2 Apr 2011 20:29:18 +0000 (20:29 +0000)]

fix flipped scissor coordinates in dpsoftrast render path

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

commit | commitdiff | tree

havoc [Sat, 2 Apr 2011 16:55:32 +0000 (16:55 +0000)]

slight optimization to 2D rendering - if triangle wslope is 0, don't
bother doing any math, just fill the zf array

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

commit | commitdiff | tree

havoc [Sat, 2 Apr 2011 04:38:13 +0000 (04:38 +0000)]

enable SSE2 instructions when compiling dpsoftrast.c

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 15:02:51 +0000 (15:02 +0000)]

fix compilation when SSE2_PRESENT, also fix compilation without SSE_POSSIBLE

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

commit | commitdiff | tree

eihrul [Fri, 1 Apr 2011 21:05:36 +0000 (21:05 +0000)]

fix the 0.5-fix

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

commit | commitdiff | tree

divverent [Fri, 1 Apr 2011 21:00:18 +0000 (21:00 +0000)]

dpsoftrast: fix off-by-0.5 in GL_NEAREST

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

commit | commitdiff | tree

divverent [Fri, 1 Apr 2011 20:50:40 +0000 (20:50 +0000)]

fix texture filtering accuracy bugs in the C variant (12bit vs 16bit) in softrast

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

commit | commitdiff | tree

divverent [Fri, 1 Apr 2011 20:16:53 +0000 (20:16 +0000)]

possibly fix offset calc for infobar

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

commit | commitdiff | tree

havoc [Fri, 1 Apr 2011 14:59:17 +0000 (14:59 +0000)]

WGL client can now use DPSOFTRAST, added thread_win.c to avoid SDL dependency for WGL client
added Sys_HaveSSE and Sys_HaveSSE2 functions in sys_shared.c and cleaned up that mess in model_alias.c
dpsoftrast now compiles if SSE_POSSIBLE rather than SSE2_PRESENT, and uses Sys_HaveSSE2 for runtime detection on x86

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

commit | commitdiff | tree

eihrul [Fri, 1 Apr 2011 14:40:48 +0000 (14:40 +0000)]

fix Vertex_BoundY params

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

RSS Atom