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

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

projects / xonotic / darkplaces.git / log

divverent [Sat, 7 May 2011 21:00:32 +0000 (21:00 +0000)]

add buttons 9 to 16; improve autocvar description

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

commit | commitdiff | tree

divverent [Sat, 7 May 2011 16:12:22 +0000 (16:12 +0000)]

fix water renders with r_viewscale

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

commit | commitdiff | tree

divverent [Sat, 7 May 2011 15:21:57 +0000 (15:21 +0000)]

try harder to get a version string out of git

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

commit | commitdiff | tree

havoc [Sun, 8 May 2011 21:02:54 +0000 (21:02 +0000)]

lovely untested OSX code for detecting gamedir inside .app

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

commit | commitdiff | tree

havoc [Sun, 8 May 2011 21:02:21 +0000 (21:02 +0000)]

don't bother using GL_ARB_texture_non_power_of_two on OSX, too buggy

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

commit | commitdiff | tree

vortex [Sun, 8 May 2011 20:33:48 +0000 (20:33 +0000)]

renabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts with quake's particle().

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

commit | commitdiff | tree

havoc [Sun, 8 May 2011 20:23:04 +0000 (20:23 +0000)]

updated to SDL1.2.14 version of OSX main code

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 20:56:35 +0000 (20:56 +0000)]

add 2 missing casts

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 19:31:50 +0000 (19:31 +0000)]

we can enable NPOT fonts, there seems to be no slowdown from it

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 18:34:10 +0000 (18:34 +0000)]

new cvar: r_font_nonpoweroftwo (to save GPU VRAM for fonts)

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 18:33:35 +0000 (18:33 +0000)]

add a debug print about font map use

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 18:33:10 +0000 (18:33 +0000)]

FINALLY use the mapidx right

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

commit | commitdiff | tree

divverent [Fri, 6 May 2011 18:32:45 +0000 (18:32 +0000)]

to resolve the format string madness once and for all: write explicit casts for all args in this printf

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

commit | commitdiff | tree

havoc [Fri, 6 May 2011 13:39:22 +0000 (13:39 +0000)]

added .float sendcomplexanimation server qc field which if TRUE will
send .frame .frame2 .frame3 .frame4 .frame1time .frame2time .frame3time
.frame4time .lerpfrac .lerpfrac3 .lerpfrac4 OR .skeletonindex if set
(BANDWIDTH HOG, skeletal networking inadvisable in multiplayer)

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

commit | commitdiff | tree

havoc [Fri, 6 May 2011 13:05:29 +0000 (13:05 +0000)]

fix a format error in map_identifier (load_flags needs to be u, not g)

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

commit | commitdiff | tree

havoc [Fri, 6 May 2011 09:08:29 +0000 (09:08 +0000)]

fix bug with iqm models by removing pose 0 optimization (as it
represents the basepose in iqm, not the first pose)

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

commit | commitdiff | tree

vortex [Wed, 4 May 2011 21:08:05 +0000 (21:08 +0000)]

Removed mqt_viewmindist as it messes up order and don't give much.

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

commit | commitdiff | tree

havoc [Thu, 5 May 2011 11:49:33 +0000 (11:49 +0000)]

fix serious error in font caching

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

commit | commitdiff | tree

havoc [Thu, 5 May 2011 03:44:49 +0000 (03:44 +0000)]

avoid creating an empty config.cfg in the basedir folder unless doing
the historical compatibility mode (only for id1 on Windows)

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

commit | commitdiff | tree

divverent [Wed, 4 May 2011 05:02:10 +0000 (05:02 +0000)]

avoid rendering the glyphs when not needed

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

commit | commitdiff | tree

divverent [Wed, 4 May 2011 05:02:07 +0000 (05:02 +0000)]

free the data allocated by font rendering, even if the image is not to be used

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

commit | commitdiff | tree

divverent [Wed, 4 May 2011 05:02:04 +0000 (05:02 +0000)]

also calculate padding if the font glyph is not to be rendered

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

commit | commitdiff | tree

divverent [Wed, 4 May 2011 05:02:02 +0000 (05:02 +0000)]

add a third mode to call Font_Postprocess (NULL image, but pitch set)

This performs the same padding calculation as if the image were set, but does not actually process

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 18:33:50 +0000 (18:33 +0000)]

fix screenshot prefix updates on gamedir change

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 18:03:22 +0000 (18:03 +0000)]

fix loading of quake lmp/wad textures

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 17:41:59 +0000 (17:41 +0000)]

gl_texturecompression is no longer required for TEXF_COMPRESS flag to
work - this cvar is now checked by the callers, so r_font_compress is
independent of it now
added r_texture_dds_save 2 setting which saves dds files even for
uncompressed textures, allowing one to completely skip source art files

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 13:34:49 +0000 (13:34 +0000)]

avoid bugs introduced by the attempt to skip image processing - a closer
look is needed

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 11:42:49 +0000 (11:42 +0000)]

don't upload the same ft2 font texture more than once
added r_font_diskcache (can read/write tga and dds)
added r_font_compress (saves memory by compressing the texture)

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 07:57:10 +0000 (07:57 +0000)]

check GL_ARB_fragment_shader

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

commit | commitdiff | tree

havoc [Tue, 3 May 2011 07:29:39 +0000 (07:29 +0000)]

reworked GL shader detection a bit, now works on Mac with Intel GMA 945 again

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

commit | commitdiff | tree

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

RSS Atom