]>
de.git.xonotic.org Git - xonotic/darkplaces.git/log
havoc [Wed, 9 Jun 2010 21:05:14 +0000 (21:05 +0000)]
fix pqrcon rcon_password bug introduced in r9420 (was not
nul-terminating a string)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10233
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f538c7b87b0da3af31b454f3e83aa1f32f32c1dd
divverent [Sun, 13 Jun 2010 18:26:25 +0000 (18:26 +0000)]
it is libpng14.14.dylib on OSX
From: Merlijn Hofstra <merlijnhofstra@mh.local>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10234
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7f4e1fa7eb935945f8d86b87f10e3fe921adb3a2
divverent [Wed, 9 Jun 2010 09:58:16 +0000 (09:58 +0000)]
VM_sprintf(): make %i treat the input as QC integer, as opposed to float. %d of course continues to expect a QC float.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10232
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4d61e95a5205a37ed58f0145ca6cbdadd4d517b9
divverent [Sun, 6 Jun 2010 18:22:16 +0000 (18:22 +0000)]
oops, should use 1.4.0 in the libpng14 version string to be sure
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10231
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
50d8d204d06d81edaf3066973a8ed2d18b643491
divverent [Sun, 6 Jun 2010 18:21:23 +0000 (18:21 +0000)]
libpng14's .so name is libpng14.so.14, not .0 as usual
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10230
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
98567a812fda612bb59d0781f8cf4d31d5264355
divverent [Sun, 6 Jun 2010 18:11:12 +0000 (18:11 +0000)]
experimental libpng14 support
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10229
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f0314987446917df899bfb296bc5b0bdd9ccf8e7
divverent [Sun, 6 Jun 2010 17:50:13 +0000 (17:50 +0000)]
png: no longer use png_set_gray_1_2_4_to_8? (N/A in libpng14, and redundant anyway as png_set_expand does the same)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10228
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
65c522c982b0d384d72cdb915a0497945f764a05
vortex [Sun, 6 Jun 2010 16:33:45 +0000 (16:33 +0000)]
support for q3map2's custinfoparms.txt in Mod_LoadQ3Shaders, so now you can create custom surfaceparms that works with BIH.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10227
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cfa39fe98ca9b6ffb70434980802cafb4ace63d6
divverent [Sat, 5 Jun 2010 16:55:35 +0000 (16:55 +0000)]
if a dotranslate_ variable exists, ALWAYS assume the opt-in way of translating
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10226
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
046924d1bf29b8ff4d6ea6657a9e6277ab5c4828
Merlijn Hofstra [Sun, 6 Jun 2010 13:52:46 +0000 (15:52 +0200)]
support user install of SDL framework
divverent [Fri, 4 Jun 2010 21:55:25 +0000 (21:55 +0000)]
sv_airspeedlimit_nonqw: a soft speedlimit for games using sv_airaccel_qw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10225
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e7b94ee742d220019c15cc5720215b75cf3fb24c
eihrul [Tue, 1 Jun 2010 19:54:39 +0000 (19:54 +0000)]
iqmbounds loading fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10224
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef555ae606d879ba26a27153fc71fdda98317a56
eihrul [Tue, 1 Jun 2010 19:52:53 +0000 (19:52 +0000)]
sanity checking of most header offsets/sizes in IQM
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10223
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2a0fe591abb661757d30036c33bbb50f85849acb
vortex [Tue, 1 Jun 2010 19:24:45 +0000 (19:24 +0000)]
fix defaultfont scale bug (which makes it invisible)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10222
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b05148d85987f1a5d31ee319926c896a4a95c0d3
havoc [Fri, 28 May 2010 09:35:33 +0000 (09:35 +0000)]
raise MAX_STATICENTITIES for a new map goldenboy is making
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10221
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0002fd924cc7129181a5757a3a2702a9af4def4e
divverent [Thu, 27 May 2010 20:13:30 +0000 (20:13 +0000)]
fix some sentinel related error messages
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10220
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
69e62bbc654b778518af1e2872f14e5b00d7cdbe
divverent [Wed, 26 May 2010 21:54:45 +0000 (21:54 +0000)]
Merge remote branch 'origin/mirceakitsune/gunmodel_effects'
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10219
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0eb435e2105218df21252d8bd3dded4a649b382c
vortex [Mon, 24 May 2010 18:20:25 +0000 (18:20 +0000)]
fix a bug with font scale/voffset not surviving r_restart by moving this settings to dp_font->settings. Added "scale" and "voffset" custom switches to loadfont console command.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10218
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e9e658105ffd3f155b6f874fd79cbef340629748
divverent [Mon, 24 May 2010 07:43:45 +0000 (07:43 +0000)]
Mod_Alias_GetTagIndexForName returns an 1-based index, not 0-based, so fix skel_find_bone for that
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10217
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6587c432a999ab2a1e0bbdac77b555dc711a3939
vortex [Sun, 23 May 2010 12:11:33 +0000 (12:11 +0000)]
try fix a warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10216
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
aacc356f7442208c775971b3abb71cea0b749b2d
divverent [Sun, 23 May 2010 11:53:42 +0000 (11:53 +0000)]
remove a superfluous and possibly harmful block in cl_input.qc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10215
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
53733530ea84c8bf61961462dd8d67c497e6459c
vortex [Sat, 22 May 2010 23:52:10 +0000 (23:52 +0000)]
DP_GFX_FONTS: add 2 additional parms to loadfont() - char scale and vertical offset, scale are identical to .width file "scale" parm (per-character center-oriented scale that doesn't change line height), vertical offset are added to each char during render, it's a multiplier to character height.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10214
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6e72d351e642c980bf8dd007fdb2617c8932fbb5
vortex [Sat, 22 May 2010 22:50:34 +0000 (22:50 +0000)]
bugfix recent font additions
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10213
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e01b6fe3d09bf6f4f57729cb5d0c3460ac426839
vortex [Sat, 22 May 2010 22:22:17 +0000 (22:22 +0000)]
documented DP_GFX_FONTS/DP_GFX_FONTS_FREETYPE/DP_UTF8
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10212
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7da0522da5cf96bbb95c23cdefe1a90de801691f
vortex [Sat, 22 May 2010 22:18:08 +0000 (22:18 +0000)]
formed DP_GFX_FONTS/DP_GFX_FONTS_FREETYPE/DP_UTF8 extensions, add loadfont()/findfont() builtins. Font structure is now expandable (grows by 8), so new fonts could be added at no limits, just use new names for loadfont. When loading font, check for given file path before add extensions, this make "loadfont user1 myfont.ttf 10" work correctly.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10211
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c2673128f60447e2884d89455ebbcaffbc4f6bb3
divverent [Sat, 22 May 2010 18:41:10 +0000 (18:41 +0000)]
sv_airstrafeaccel_qw cvar for tuning CPMA-style physics
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10210
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
728e717bdc878f4ef2fb4311619b232949fb16aa
motorsep [Sat, 22 May 2010 15:18:44 +0000 (15:18 +0000)]
+Added Urre's game, "Strap-on-bomb Car"
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10209
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1424b2fc6cba5da0ac58dd94c683821dbab4835d
divverent [Fri, 21 May 2010 21:12:08 +0000 (21:12 +0000)]
fix a wrong mempool use in Mod_Alias_AnimateVertices that crashed on dedicated server due to r_main_mempool not existing there
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10208
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e69b63d410e8f60da39c370027fc5daea820a7a8
divverent [Fri, 21 May 2010 11:57:57 +0000 (11:57 +0000)]
fix a typo in default deluxemap setup
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10207
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ce0b0f29d2fda06126651b78fb04a5741a1f6f75
divverent [Fri, 21 May 2010 05:41:38 +0000 (05:41 +0000)]
Make another replacement
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10206
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ab49cf6b50de0dd9160c4325198bdf1253372373
divverent [Fri, 21 May 2010 05:41:27 +0000 (05:41 +0000)]
Oops, forgot something
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10205
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
76e4c7368717520b5182d72f596bdbfd97a3860b
divverent [Fri, 21 May 2010 05:41:25 +0000 (05:41 +0000)]
Attempt to fix issues with spectating / demos
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10204
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ed91aae0a72e1e9a51b45910c2b9dc6dc383ca0b
divverent [Wed, 19 May 2010 06:23:22 +0000 (06:23 +0000)]
fix warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10203
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a915475ec3441cb67ac0d91abf2c18ba4a7a565e
divverent [Wed, 19 May 2010 06:10:33 +0000 (06:10 +0000)]
fix stairsmoothing annoyance through warpzones
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10202
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f08238685a7cddc0363dc446866ce20ea2575f38
vortex [Tue, 18 May 2010 19:06:45 +0000 (19:06 +0000)]
remove some Blood Omnicide related hacks, fixed video stippling on ATI (always draw black pic behind)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10201
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f55a2becba4b17fbd7335f20d64063d4dd437043
divverent [Tue, 18 May 2010 18:46:29 +0000 (18:46 +0000)]
autocvars: update to current value after loading a savegame, to always fulfill the invariant "autocvar = cvar value"
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10200
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f4d89c11594f247887a62a78877a36f85fdd2ee
divverent [Tue, 18 May 2010 10:03:09 +0000 (10:03 +0000)]
fix a double free problem in jpeg.c
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10199
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f59bcc296e498a2b3851eed449c4de9df178e553
divverent [Tue, 18 May 2010 09:54:35 +0000 (09:54 +0000)]
start of "dpdefs", QC files that define all current DP features
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10198
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
44eca4096e55c7625b8f8e377806aa7f8365b96b
vortex [Sun, 16 May 2010 21:05:13 +0000 (21:05 +0000)]
made cprogs.dat builtin #303 (setproperty) accept 1 parm, in this case it will return a value of property stored in engine struct instead of setting it. Pretty useful with several viewports code + 2d drawing. Curently the only property that can't be returned is VF_VIEWPORT (will give a warning) as it stored in 2 vectors (VF_MIN and VF_SIZE). To use new feature define 2 more builtins:
float(float property) getproperty = #303;
vector(float property) getpropertyvec = #303;
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10197
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
515c01976be481f5d06169f193a7527fd567e83c
havoc [Tue, 11 May 2010 21:40:35 +0000 (21:40 +0000)]
really fix multiple effectinfo.txt file loading
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10194
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9c8d7d8f9191f8e7f31b8a737d1a7dd1e04a6813
divverent [Sat, 15 May 2010 18:33:54 +0000 (18:33 +0000)]
attempt at better defaults for gunmodel effects; try to make jumping look more natural
From: FruitieX <rasse@rasse-lappy.localdomain>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10196
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9f3a1752aad83c746b5a7bd554d4c7553fd92de4
divverent [Wed, 12 May 2010 07:59:29 +0000 (07:59 +0000)]
DP_CSQC_BOXPARTICLES
allow particles to be tinted, and trails to be modded in their spacing by the particle count factor
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10195
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f69dd60228f9846eb768b71790a00a2262cba028
havoc [Tue, 11 May 2010 21:06:21 +0000 (21:06 +0000)]
fix loading of q1bsp sky replacement textures to also check
textures/mapname/sky4 and such
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10193
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
76e2cc47045f535d5b71d1afa3ff4789f964ebd3
divverent [Tue, 11 May 2010 15:51:15 +0000 (15:51 +0000)]
two more obvious bugs in worldnamenoextension
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10192
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
59521431b3fab534a48931527bc6e6a3053a8bd1
divverent [Tue, 11 May 2010 15:47:26 +0000 (15:47 +0000)]
properly strip the / from worldbasename
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10191
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3ca7c53a5e44ff93c8c483581e89e4d3d17cbf80
havoc [Tue, 11 May 2010 09:35:29 +0000 (09:35 +0000)]
append maps/mapname_effectinfo.txt as intended
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10190
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
369153300a877f32ec3c0e4ea112cf2ac5bb20bf
havoc [Tue, 11 May 2010 09:35:09 +0000 (09:35 +0000)]
somehow I missed this edit in the other maps/ checks
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10189
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
064213f25fd7d96bf1608bdbdb1e604ff0efd9f5
divverent [Tue, 11 May 2010 09:11:48 +0000 (09:11 +0000)]
particles: apply rotation so that in the initial display frame of the particle, the start rotation min/max are shown
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10188
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a36ccfb94ba6000ab545b4f1c934fc6a6cc9344
divverent [Mon, 10 May 2010 06:57:49 +0000 (06:57 +0000)]
anoth'error bites the dust
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10187
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9d4a938aa6754bd45770b240fb5820772ecbe8e5
divverent [Mon, 10 May 2010 06:54:13 +0000 (06:54 +0000)]
fix compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10186
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
810077aff6c99517dbd4e112d1f5f184745d1a33
havoc [Mon, 10 May 2010 06:29:56 +0000 (06:29 +0000)]
fixed bug with effectinfo.txt loading so that it now loads the proper
name for the map
added cl.worldmessage, cl.worldname, cl.worldbasename,
cl.worldnamenoextension strings (and sv. versions) as well as cvars
audited all use of these variables in the engine for consistent behavior
basename generation for maps now strips only maps/ prefix (allowing
subdirectory paths to be preserved)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10185
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef9fefb7ab57b0bfe6c159b75ea905db519c7cdd
divverent [Sun, 9 May 2010 13:21:40 +0000 (13:21 +0000)]
stringbuffers: allow "" strings, keep disallowing NULL strings.
Now, bufstr_set'ing an item to string_null will yield string_null on bufstr_get,
and bufstr_set'ing an item to "" will yield "" on bufstr_get.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10184
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9399e2dd28d4db4dde5fc1f03af9cbf2c3aad3ac
divverent [Sun, 9 May 2010 13:08:56 +0000 (13:08 +0000)]
fix segfault on empty slots in a stringbuffer on buf_sort
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10183
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f2f99c891d575a2982667ef1af876a4e72ca02e3
divverent [Sun, 9 May 2010 10:34:50 +0000 (10:34 +0000)]
add a missing include
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10181
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
447d530cf6c1bce63662cd1d0705e9636cb1cdb1
divverent [Sun, 9 May 2010 10:28:26 +0000 (10:28 +0000)]
screenshot: get rid of the 3*w*h+18 TGA buffer; instead however always capture as BGRA from the GPU;
also cvar: r_drawworld (when 0, turns off world drawing), and scr_screenshot_alpha (try to save alpha channel with screenshot).
Together, with this one can make nice alpha transparent screenshots of player models.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10180
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c3edd749ac26c6322eafa8303e592df3c32ffd25
divverent [Sat, 8 May 2010 12:37:48 +0000 (12:37 +0000)]
WritePicture: also support png input images :P
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10176
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e0f3baa334fd30a181cd1eacf39dc26e8841b4e9
divverent [Sat, 8 May 2010 12:37:44 +0000 (12:37 +0000)]
makefile: we need to link to image loading libs in the dedicated server too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10175
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2457d2e4f3e37ddb6665a1368136735dfeb8dafd
divverent [Thu, 6 May 2010 06:45:32 +0000 (06:45 +0000)]
new cvar: mastervolume (controlling both volume and bgmvolume)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10173
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
32510c922fbcaad22056befd2018ea9066c1f138
vortex [Wed, 5 May 2010 18:55:49 +0000 (18:55 +0000)]
add r_editlights_lock command which will lock selection on current selected light (or unlock if already locked)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10172
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
80234e3d370436fe1a9a06ac93404362349f72c8
divverent [Tue, 4 May 2010 11:08:40 +0000 (11:08 +0000)]
demo deleting: switch the meaning of the values 2 and 3 in cl_autodemo_delete, so & 1 would check if the CURRENT demo is to be deleted, and & 2 would check if any future demos are to be deleted
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10171
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
16719bad0f7f92ae5a6def481c99f9be969820ca
vortex [Sun, 2 May 2010 19:43:54 +0000 (19:43 +0000)]
call m_hide() on loadgame/map/changelevel/restart if keydest is menu one (menu or menu_grabbed), since we are going to force it to key_game (which if not forcing to m_hide leads to menu drawn but not reacting to key events).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10167
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d654a049fd0b331a4fd7b65e3c06ae087ebe77e6
divverent [Tue, 4 May 2010 07:31:52 +0000 (07:31 +0000)]
properly declare the aircontrol power cvar
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10170
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a7e53f4afc8ba4aeadd8bdd10a2167aceca77ab
divverent [Tue, 4 May 2010 05:14:45 +0000 (05:14 +0000)]
fix the EndIncreaseEdicts handlers as edicts beyond num_edicts are not initialized yet
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10169
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9edb82a5ebb4cbf2645fa154815df3baa3e59535
divverent [Mon, 3 May 2010 19:43:20 +0000 (19:43 +0000)]
sv_aircontrol_power - customizing the response curve of CPMA style air control
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10168
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4bef4ef2d5b49bb0954597c4bd7f04a952518bea
havoc [Sun, 2 May 2010 17:33:00 +0000 (17:33 +0000)]
added -noconfig commandline option for benchmarking purposes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10165
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dd749c0663a6e55f2513c4f31fc72c8eaead41d3
divverent [Sun, 2 May 2010 14:11:12 +0000 (14:11 +0000)]
for now, turn off gun lean and follow effects by default
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10162
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
15fb2410cafd9ba53b7b227fe8a7ed24c7f04b12
divverent [Sun, 2 May 2010 14:10:40 +0000 (14:10 +0000)]
Revert "gunangles[ROLL] = cl.viewangles[ROLL] rather than 0, because the view may roll sometimes.", as this contains the difference in roll angle, not the roll angle itself
This reverts commit
7ef836e6b9fb5a58e0c10978efbb83a5430b5905 .
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10161
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3b9f3021e40a36ba7dd9512cf19249736d1e3998
divverent [Sun, 2 May 2010 14:10:12 +0000 (14:10 +0000)]
fix most of the guneffect issues with warpzones
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10160
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b7cf56844dcdfc23ce38ba9b3c7b5342b2fd84a3
divverent [Sun, 2 May 2010 14:09:57 +0000 (14:09 +0000)]
gunangles[ROLL] = cl.viewangles[ROLL] rather than 0, because the view may roll sometimes.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10159
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3e2f98b76b520acf73c8b27b108cc973da8c815
divverent [Sun, 2 May 2010 14:09:46 +0000 (14:09 +0000)]
Use only one pair of toggle cvars.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10158
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
088011f0d4bec90d4c73de4d94f22531c4d45206
divverent [Sun, 2 May 2010 14:09:34 +0000 (14:09 +0000)]
attempted fix for teleports
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10157
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
45329bdb67e6117291abc09cbedeb64bf1a06238
divverent [Sun, 2 May 2010 14:09:29 +0000 (14:09 +0000)]
Better following limits for the new code. Added new cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10156
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cc27af0a62aaa14f37203c7863ea80faa8c9b777
divverent [Sun, 2 May 2010 14:09:17 +0000 (14:09 +0000)]
hopefully fix issues with mouse motion (shivering) and warpzones
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10155
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb1cf185b836afce7c31b8e187c90e9d4647ae5d
divverent [Sun, 2 May 2010 14:09:09 +0000 (14:09 +0000)]
Add the highpass cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10154
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b2079b40ba19bfb326909f439ab3bfda14465865
divverent [Sun, 2 May 2010 14:09:01 +0000 (14:09 +0000)]
simplify and clean up the gun model effects code a bit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10153
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e6c3fa55117e7004ef9ada041fd1eed4b08800f
divverent [Sun, 2 May 2010 14:08:57 +0000 (14:08 +0000)]
Very minor renaming
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10152
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a58f7e6b1aa12ea3e8c8663e69d4efd81c7e1046
divverent [Sun, 2 May 2010 14:08:51 +0000 (14:08 +0000)]
Use cl.realframetime properly again
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10151
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
874d8f76ec8f70b02675649ccecf0486d743d17b
divverent [Sun, 2 May 2010 14:08:35 +0000 (14:08 +0000)]
Actually, why not persist gunorg and gunangles and work with them directly, rather than using intermediary vectors and replacing with them?
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10150
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8550293cb14c4078ac42164656b4536a218c03ea
divverent [Sun, 2 May 2010 14:08:30 +0000 (14:08 +0000)]
Minor optimizations
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10149
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
74c715a123e45dd43b6032ae5f9e151985241dd9
divverent [Sun, 2 May 2010 14:08:23 +0000 (14:08 +0000)]
Weapon following: Subtract player velocity from gun origin rather than making the gun follow the player. Reduces a huge code to a few lines and works much better. How could I not realize this until now? :P
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10148
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a8b88dda9e6e91a74a5cd0eabf8e6deb88de9acd
divverent [Sun, 2 May 2010 14:08:01 +0000 (14:08 +0000)]
Use averaging for calculating the leaning speed. Most of the credits go to FruitieX for this code.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a43bd0a32bbf3c2d04555417a7a46a1fcaa2d714
divverent [Sun, 2 May 2010 14:07:45 +0000 (14:07 +0000)]
Make leaning even faster (more discrete). Fix typos from previous commit.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10146
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
086d225b8857e040f4d8d691b8c7029f85025bbb
divverent [Sun, 2 May 2010 14:07:39 +0000 (14:07 +0000)]
Tweak limits, to make this more like in Half-Life 2 :)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10145
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6b919716f3d1141e66610e4e966eeefc33e7c822
divverent [Sun, 2 May 2010 14:07:30 +0000 (14:07 +0000)]
Faster speeds and tighter limits by default
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10144
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f5680929fc0f74c0b26073a8dc238ed7b6815317
divverent [Sun, 2 May 2010 14:07:13 +0000 (14:07 +0000)]
Fix slowmo speed
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10143
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
472d7de72bd767ae53d98682dd78c690aeee3bb1
divverent [Sun, 2 May 2010 14:07:02 +0000 (14:07 +0000)]
Minor comment arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10142
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
42d1b5f714589cdce0fa0195aaf78706b3db7192
divverent [Sun, 2 May 2010 14:06:49 +0000 (14:06 +0000)]
try to fix the gun origin for view bobbing
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10141
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
38454f0f53e0fbe2c1dca6e32426fe360cddc26b
divverent [Sun, 2 May 2010 14:06:38 +0000 (14:06 +0000)]
Revert "More arrangements"
This reverts commit
06694fee2275d36160c2948be3fd1f224842d800 .
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10140
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb124a812a90a43f6984e999244548896c0110b3
divverent [Sun, 2 May 2010 14:06:22 +0000 (14:06 +0000)]
More arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10139
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
93df350f3237f064b8e119af2cb5f02a1f7b63a2
divverent [Sun, 2 May 2010 14:06:14 +0000 (14:06 +0000)]
Fix some comments
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10138
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b5605388681066494f754a3202bdf3a904d8e266
divverent [Sun, 2 May 2010 14:06:08 +0000 (14:06 +0000)]
fix a typo in the last commit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10137
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b41be46ff68f49e9d832fd081ad040c5be6cf33e
divverent [Sun, 2 May 2010 14:06:02 +0000 (14:06 +0000)]
move the new globals into the cl struct
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10136
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2e08d0c41d863477118bb838762afd6aa715bb4b
divverent [Sun, 2 May 2010 14:05:53 +0000 (14:05 +0000)]
some fixes to Taoki's code regarding axis-independence
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10135
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a0017eda3f6ec89608af44b0c1d3255befc354d3
divverent [Sun, 2 May 2010 14:05:43 +0000 (14:05 +0000)]
Final checking and cleanup on my end. Imo this should be ready for testing.
I'm not very good with C and this is my first code for Darkplaces. Therefore my coding may not be that great, so if anyone with more experience could check and optimize this I would be grateful. Please message me on IRC for anything regarding this patch (Taoki).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10134
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8fa6f5aec617b5c1e13ad4de2ffa4a412f3a6e8
divverent [Sun, 2 May 2010 14:05:33 +0000 (14:05 +0000)]
Cvars for part 2. Added safety checks and fixed gunmodel bobbing.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10133
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
625c75ef5d167e769b8b65c8d47238c4b0710872
divverent [Sun, 2 May 2010 14:05:27 +0000 (14:05 +0000)]
Limits for part 2.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10132
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b801f2e6336a273e2fede59039bc393185a6f061
divverent [Sun, 2 May 2010 14:05:16 +0000 (14:05 +0000)]
Part 2 of the viewmodel effects. Gunmodel now "follows" the player, causing it to also push back when you're walking forward and get pulled when you're walking back. To be limited and cvared like the first part.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10131
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7ab8ad15b3891b903f5d6374662bacb7d9db1f65
divverent [Sun, 2 May 2010 14:04:58 +0000 (14:04 +0000)]
Add cl.movevars_timescale into the mix so this works correctly with slowmo. Previous commit stays (if the leaning speed is too high, slowmo is too fast and framerate is too low, the effect is temporarily disabled).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10130
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2572a44e5cc8874ea2e806fd9627959b257dd63e
divverent [Sun, 2 May 2010 14:04:50 +0000 (14:04 +0000)]
Disable when cl.realframetime * speed_cvar go over 1, otherwise angles go crazy and the gun spins at very low FPS. By default this only affects very low framerates, unless setting the speed to high values. Can't think of a better way to avoid the braking angles, but imo this is alright.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10129
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
284f629a0f79a6107caa0c821a314609565b0f64
divverent [Sun, 2 May 2010 14:04:40 +0000 (14:04 +0000)]
Base animation on cl.frametime
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10128
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
89869addee43f275947a8d35aa74f368d50c0dbe