]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
divverent [Sat, 14 May 2011 13:06:28 +0000 (13:06 +0000)]
add a missing declaration in last commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11149
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a03c89272a7193c133db45d45e22a223342a861
divverent [Sat, 14 May 2011 13:03:44 +0000 (13:03 +0000)]
Attempt to make loading screens not stay cached, to avoid loading GPU memory when having high resolution loading images.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11148
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0b4cff287c2e7d621f0ed198c6e00f976dbf8d31
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e272f5efe910b09242dd42c4044aa85bfe9b1710
vortex [Wed, 11 May 2011 22:59:39 +0000 (22:59 +0000)]
OpenGL 2.0 path: Make handling of Alpha-To-Coverage same as AlphaTest (enabling before surface render and disabling after), instead of hacky R_ShadowMode_Begin force-to-disable, this also fixes shadowmap bug with ATI hardware. Also made vid_multisampling (if enabled) to force minimal vid_samples 2.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11146
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
414e08ab14df747e51896a7e437401741470205a
havoc [Mon, 9 May 2011 15:44:40 +0000 (15:44 +0000)]
added pmove_onground to get this value from the engine prediction
added pmove_inwater to get this value from the engine prediction
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11143
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e0d72a97bea6a4f2af3bf0fffefe428650bac8b4
havoc [Mon, 9 May 2011 13:35:35 +0000 (13:35 +0000)]
fix missing .string message fielddef
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11142
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
11df435654c96dd18d622b68ab2a819584555b95
havoc [Mon, 9 May 2011 13:35:20 +0000 (13:35 +0000)]
add the prvm_badvalue variable needed by the last commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11141
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
547992e433dfac23e1d5e6ff91f4e44335164e70
havoc [Mon, 9 May 2011 13:32:31 +0000 (13:32 +0000)]
added debugging code for PRVM_EDICTFIELD*/PRVM_GLOBALFIELD* macros,
these now warn if the fieldoffset is invalid, and do not crash
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11140
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
01fb45d86cd8443142099a9b3064c26908ba3c69
vortex [Mon, 9 May 2011 11:28:12 +0000 (11:28 +0000)]
Move Alpha-To-Coverage stuff to gl_backend.c, fix bug with shadows rendering.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11139
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
20cff5b6fe91a72c3ed5d287cfb73e51e2ab350d
havoc [Sun, 8 May 2011 22:52:32 +0000 (22:52 +0000)]
fix a crash
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11138
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
aff7b9f6daa22f434d25c50a984abebad71a4f22
havoc [Sun, 8 May 2011 19:51:49 +0000 (19:51 +0000)]
fix another warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11131
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
912fc8ebf5b77692efc450e89545420e5b3e6ad5
havoc [Sun, 8 May 2011 19:49:05 +0000 (19:49 +0000)]
fix a C++ compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11130
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
19370b494c664501e846a704f007e86d416dd382
havoc [Sun, 8 May 2011 18:37:26 +0000 (18:37 +0000)]
a few more PRVM_EDICTFIELDVALUE/PRVM_GLOBALFIELDVALUE uses fixed
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11129
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ab5ec6e843efaaa298f6661cf398ac9ed79f61b0
havoc [Sun, 8 May 2011 18:34:47 +0000 (18:34 +0000)]
removed NULL checks for PRVM_EDICTFIELDVALUE/GLOBALFIELDVALUE
added PRVM_EDICTFIELDFLOAT/VECTOR/STRING/EDICT/FUNCTION variants
added PRVM_GLOBALFIELDFLOAT/VECTOR/STRING/EDICT/FUNCTION variants
this should improve performance slightly, and make code audits easier
updated required fields lists, added required globals lists
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11128
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9e0b57e36ca8bb835c2f49901b4493b1f3b5625a
vortex [Sun, 8 May 2011 21:55:18 +0000 (21:55 +0000)]
GL_ARB_multisampling defs (vid_multisampling) and alpha-to-coverage effect (r_transparent_alphatocoverage) for alphaTest surfaces, which dont use multisampling yet but looks better for most cases, especially for overhead games.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11136
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f7b0c61e168f52b255e42a9cf26e87bf7be6fc41
havoc [Sun, 8 May 2011 13:49:35 +0000 (13:49 +0000)]
fixed RF_VIEWMODEL really good this time
renamed cl.csqc_origin to cl.csqc_vieworigin, cl.csqc_angles to
cl.csqc_viewangles, and added cl.csqc_vieworiginfromengine and
cl.csqc_viewanglesfromengine which are used to restore the view
parameters when R_ClearScene is used in csqc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11123
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a1eb88e8cd541ac340c36fb31d9dfa85cf181c4c
havoc [Sun, 8 May 2011 13:16:54 +0000 (13:16 +0000)]
fix bug in last patch, fix RF_USEAXIS handling
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11122
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6ca878eac347c3d744ac078de95fcb17a2af5d34
havoc [Sun, 8 May 2011 12:56:22 +0000 (12:56 +0000)]
fix RF_VIEWMODEL by using CL_GetTagMatrix on self rather than
self.tag_entity
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11121
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6b9d903de3ec0ac28f43f18e2df4ab7b09cbf1d5
havoc [Sat, 7 May 2011 12:36:28 +0000 (12:36 +0000)]
added vid_sRGB cvar, this replaces the r_texture_sRGB* cvars and
modifies all texture loading (including bsp, mdl, spr, lmp, as well as
external textures) and the output gamma to achieve sRGB corrected
rendering, not all renderpaths support this and the feature will be
automatically disabled on such renderpaths
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11116
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
72febe336719285ecd4f855454d1e90f7aa99834
havoc [Sun, 8 May 2011 22:28:44 +0000 (22:28 +0000)]
mac builds now detect if the gamedir exists in the .app/Contents/Resources/ folder
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11137
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bb696fef79b956b09b2f6766e7c87ac364ecceae
divverent [Sun, 8 May 2011 15:25:44 +0000 (15:25 +0000)]
fix naming of two fields
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11127
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b6b3148dd653325f5018c5911f44c23bbf8be477
divverent [Sun, 8 May 2011 15:21:45 +0000 (15:21 +0000)]
fix parsing in more places
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11126
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
158c9fb4b171a8e882990dbd053e9e7b0cbc60d0
divverent [Sun, 8 May 2011 15:17:06 +0000 (15:17 +0000)]
add a compare tool for dpdefs (not really complete!)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11125
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
34833b7339f862a01d8ebbcfc09aaacc72c7d202
divverent [Sun, 8 May 2011 14:42:45 +0000 (14:42 +0000)]
fix annotation of crypto fields
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11124
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c0f42e72f17f507c2bc30e6ffb5a451dc4b825d6
divverent [Sun, 8 May 2011 11:25:14 +0000 (11:25 +0000)]
fix double declarations of ODE stuff
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11120
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3391ad2a68814b35f3306b82fc021acd34660d61
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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