]>
git.xonotic.org Git - xonotic/darkplaces.git/log
havoc [Wed, 28 Jul 2010 20:12:11 +0000 (20:12 +0000)]
use TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
count 1024 (exploboxes) rather than calling the internal
CL_ParticleExplosion directly, this allows people to override the effect
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10367
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0d94889401823e11706331d987826497df4c9845
divverent [Mon, 26 Jul 2010 12:05:38 +0000 (12:05 +0000)]
bump modplug version to libmodplug-1.dll (only supports 0.8.8 upwards, sorry, but any versions before are broken on 64bit platforms anyway)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10365
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9f5dc5b8171bfb05a239c1e2a2cb041574c746d2
divverent [Tue, 27 Jul 2010 19:22:30 +0000 (19:22 +0000)]
Library loading: if a DLL succeeds to load but a function is missing, also continue to the next one but warn.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10366
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e4fc3f62a031f2c744b673d79688d6c138da3368
divverent [Sun, 25 Jul 2010 19:39:19 +0000 (19:39 +0000)]
make prydon cursor absolute, not relative
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10364
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
aac77b0462e945a3e96c3c08192f41626cdcde59
divverent [Sun, 25 Jul 2010 18:42:31 +0000 (18:42 +0000)]
fix v_flipped with near clip plane (water, warpzone)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10363
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2deb98cfc69b32025eceed117f9fd67d228e5c62
divverent [Sun, 25 Jul 2010 17:10:11 +0000 (17:10 +0000)]
Linux SDL/GLX: allow loading the icon from .xpm at runtime (darkplaces-icon.xpm). Allows for easier branding.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10362
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f4766980b5d1313e24e4b704dfebd0b99d03d792
divverent [Sun, 25 Jul 2010 12:20:39 +0000 (12:20 +0000)]
track if a cachepic has alpha, and turn off depth write if it does; also use alpha-less blendfuncs if all alpha values are >= 1 and the texture has no alpha (might be a slight performance increase, but mainly to help R_BeginPolygon in 3D space)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10360
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
303e5f6cadc3c1aca840b0475cdddfab90317a8d
divverent [Sun, 25 Jul 2010 06:14:44 +0000 (06:14 +0000)]
PROPERLY handle roundoff errors in drawsetcliparea
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10359
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2867a36bdaca3c6d0ed41c6b25e5458abea523d8
divverent [Fri, 23 Jul 2010 19:14:21 +0000 (19:14 +0000)]
Fix the usage of the CACHEPICFLAGS_NOTPERSISTENT flag in Draw_CachePic calls
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10358
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e9555fe3b5e40ddc0cfb186e7e36ac1d4ff45245
divverent [Wed, 21 Jul 2010 09:46:58 +0000 (09:46 +0000)]
CRLF fixes, .gitattributes file updated
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10357
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3497a42696aec2c34d1e6d506737b7727da2784
divverent [Tue, 20 Jul 2010 17:54:56 +0000 (17:54 +0000)]
make airstopaccelerate less accidentally epic ;)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10356
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2e6f913682aef4d97a28375d7a0085d61143779e
divverent [Tue, 20 Jul 2010 17:19:35 +0000 (17:19 +0000)]
Merge remote branch 'origin/mirceakitsune/landing_viewshake_fix'
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10355
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
75b102d91eb62435d85a2074a2d39b4a505c36f8
divverent [Tue, 20 Jul 2010 17:16:30 +0000 (17:16 +0000)]
And my third intended change: Remove view bobbing dependencies from the gun model bobbing. It has its own cvar and imo there's no reason to block this effect when the normal bobbing is disabled. Their intensities could also be different, which is another reason why I think this doesn't make sense.
I don't believe it should change anything for Quake players since this just allows you to disable both effects individually. If the core developers disagree please revert this change.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10354
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
958ac890c6281f3836e2390d6dad65de606e4dbc
divverent [Tue, 20 Jul 2010 17:16:27 +0000 (17:16 +0000)]
Second change: Use cos for the horizontal view bobbing while leaving sin for the vertical (old) one. This makes the view bobbing look rounder and prettier when both are enabled.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10353
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b0c31bd70112993cbed12a7afe21e37695d5eaa4
divverent [Tue, 20 Jul 2010 17:16:24 +0000 (17:16 +0000)]
Sort this space in a more correct way while I'm at it
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10352
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5772a5eb70fdfec26faf8044cbb56cf29dc7f54f
divverent [Tue, 20 Jul 2010 17:16:21 +0000 (17:16 +0000)]
Fix some final things on my list for my effects in Darkplaces. First change: Use the highpass / lowpass values in Xonotic for gun leaning / following, which are much better.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10351
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
033d7aa23580c29f0a2d813d0c8fb02a6743c24b
divverent [Tue, 20 Jul 2010 07:07:23 +0000 (07:07 +0000)]
sv_aircontrol_penalty
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10350
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
12178fece9fbb1932dbb11286d352688eb4803e3
divverent [Tue, 20 Jul 2010 03:51:50 +0000 (03:51 +0000)]
VM_stringtokeynum: return a float, not an int
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10349
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
10102d3de2fcf3343b93f4710f60003ea0fc9973
divverent [Fri, 16 Jul 2010 22:25:31 +0000 (22:25 +0000)]
Oops, must be framerate dependent
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10348
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db96c59b38c6b17c49204319b9d856aa34e9983a
divverent [Fri, 16 Jul 2010 22:25:25 +0000 (22:25 +0000)]
Fix the final details and disable by default. Use cl_bobfall 0.05 to test at a good value. Ready for testing and merging.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10347
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d23aff344864786260c8beb87f3990e1434e173d
divverent [Fri, 16 Jul 2010 22:25:19 +0000 (22:25 +0000)]
Minimum necessary speed for fall-bobbing to occur
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10346
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
aa0529558f794a9b2aff043357b97eb0ea80e36f
divverent [Fri, 16 Jul 2010 22:25:12 +0000 (22:25 +0000)]
Bounds
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10345
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
961d03b211c568fab07a72b494aac3e9dbc6e842
divverent [Fri, 16 Jul 2010 22:25:06 +0000 (22:25 +0000)]
Cvars. Enabled by default just for testing until everything is done.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10344
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
019b0e8cb38955f1b8e5e51667a100f5c78c521f
divverent [Fri, 16 Jul 2010 22:25:00 +0000 (22:25 +0000)]
The code works as intended! Change some names and comments in the meantime.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10343
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
920346b7aebcb8d4312987e3bb4185be13c53c91
divverent [Fri, 16 Jul 2010 22:24:54 +0000 (22:24 +0000)]
Very close to getting the correct maths done. It now works as intended, just need to separate the swing's length and speed.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10342
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
32b18b93983c83da15df794ae4e21323159cc2a5
divverent [Fri, 16 Jul 2010 22:24:42 +0000 (22:24 +0000)]
Even closer to a senseful code. We need to get just one swing using sin()
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10341
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
417370b88b5b02820dac0b30b33fd725f4f70652
divverent [Fri, 16 Jul 2010 22:24:35 +0000 (22:24 +0000)]
Use sin() for the the view going up / down. Now it needs to be arranged in a correct way.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10340
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
84cab4b18ddbe692ecdd3ddb889f16c5c5671886
divverent [Fri, 16 Jul 2010 22:24:29 +0000 (22:24 +0000)]
More progress, still nothing considerable
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10339
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
64832afd3bbc0e242cc37c6f65c6413da73a0bb9
divverent [Fri, 16 Jul 2010 22:24:23 +0000 (22:24 +0000)]
Some comments and a view bound on the speed, which should match xyspeed's for the bobbing
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10338
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
640b08639e29d6e99c2e63250aefcb73e2096a66
divverent [Fri, 16 Jul 2010 22:24:17 +0000 (22:24 +0000)]
Make the view slowly go back after hitting the ground. We need to do the same for both up and down. Also use reasonable values until cvars are done.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10337
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f10f49777267ac15108f2df78cc555583856f136
divverent [Fri, 16 Jul 2010 22:24:11 +0000 (22:24 +0000)]
Attempt to implement landing viewshake effect (the camera lowering and going back up when you hit the ground with speed). Code very primitive at this point, and just gets the basic calculation in place.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10336
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f42800577ad4cfda0aca780d1f7d28b4c2aaa14c
havoc [Fri, 16 Jul 2010 16:29:13 +0000 (16:29 +0000)]
fix uninitialized variable warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10335
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
51852eea4fa55b6b1522a9dda6211d7b9b39f234
divverent [Fri, 16 Jul 2010 09:07:42 +0000 (09:07 +0000)]
fix ~TEXF_PICMIP in DDS loading, and fix TEXF_ALPHA generation (there was a bug that caused TEXF_ALPHA to never be set, now it is set if the caller requested it AND the texture has alpha)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10334
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3dc7539384989ff69993911802634a1703f0143e
divverent [Fri, 16 Jul 2010 08:42:48 +0000 (08:42 +0000)]
cvar: r_mipnormalmaps
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10333
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
22a8aa8024a5ba6033460fceba380ee999c6ac43
havoc [Wed, 14 Jul 2010 10:18:23 +0000 (10:18 +0000)]
reworked .obj loader to work as a world model (SLOWLY though, no vis, no
surface clustering!), now also interprets o (object name) commands as
submodel number
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10326
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb8ff49ed82dabeb84945ae7bb92c2020be007b5
divverent [Thu, 15 Jul 2010 19:11:48 +0000 (19:11 +0000)]
fix ISWORLD and ISSPRITE texture flags (making r_picmipworld actually work again)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10332
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b2c5d2d1d2dbe2c5f861703de332c03e0c6a80d8
havoc [Thu, 15 Jul 2010 12:09:36 +0000 (12:09 +0000)]
better error message when map load fails
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10329
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
34dc0504b102dfa053cb051e0ad6ad2acc14ecad
havoc [Thu, 15 Jul 2010 12:08:38 +0000 (12:08 +0000)]
fix map loading in Nexuiz
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10328
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f3d0d7f735be475696e6fb9f158392a11efab316
havoc [Thu, 15 Jul 2010 10:04:30 +0000 (10:04 +0000)]
raise SVBSP polygon points limit to avoid crashes with portal tests
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10327
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dc6656290bde80d3c6f4bb184027908ea645e4fc
havoc [Wed, 14 Jul 2010 10:15:46 +0000 (10:15 +0000)]
changed modeldecompile's obj output to not negate an axis, this makes it
consistent with the OBJ loader
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10325
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c227b46e44bc1c37af4d9ef9b257c59fa396d043
havoc [Wed, 14 Jul 2010 10:13:50 +0000 (10:13 +0000)]
allow loading non-bsp files as world models (no longer always appends
.bsp suffix)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10323
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8208cec06dd1a4a263a0de114279ab3afcf5890b
havoc [Wed, 14 Jul 2010 10:10:46 +0000 (10:10 +0000)]
fix a bug with svbsp compiled lights when a leaf has no portals -
however the leaf is assumed visible, not good
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10316
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
47ffdacec654457c5ed96ee15bb10bc3998b2ff4
divverent [Wed, 14 Jul 2010 09:12:56 +0000 (09:12 +0000)]
add q prefix to modplug functions
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10315
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2cf69ea44ab1161d4a1f2891bce56c152f31d5bb
divverent [Mon, 12 Jul 2010 18:09:19 +0000 (18:09 +0000)]
Make cl_bobmodel work if cl_bob2 is enabled too. Although I don't see why bobmodel depends on view bobbing, given it has its own cvar.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10314
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3edef339706b5b89ca00b5830e44bc39200ffe0
divverent [Mon, 12 Jul 2010 18:09:16 +0000 (18:09 +0000)]
Bound the side bobbing's speed as well
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10313
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9e080fa940b27145925269fb519d8fe72a5b083e
divverent [Mon, 12 Jul 2010 18:09:13 +0000 (18:09 +0000)]
Remove xyspeed from the side bobbing. The speed is calculated separately for it, so we were multiplying the speed two times and dividing to match the proper intensity.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10312
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f91cf72b2ee80fec4bafdb4e3d019c69a7308050
divverent [Mon, 12 Jul 2010 18:09:08 +0000 (18:09 +0000)]
Comments
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10311
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
14675dc6c8c734b5a6ae0f0938fe82b44d68202e
divverent [Mon, 12 Jul 2010 18:09:03 +0000 (18:09 +0000)]
Place / move a speed bound, to avoid bobbing getting stronger if sv_maxspeed is over 400
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10310
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e11d48d5becde5e2ad87efd230ac999b2780336a
divverent [Mon, 12 Jul 2010 18:08:51 +0000 (18:08 +0000)]
Bound cvar values instead of bounding how far the view can go. This also fixes the original view bobbing, where setting a high value for cl_bob would cause the view to instantly go up and down.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10309
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
26c151cf0dd9c8064199804520246411d49d30dd
divverent [Mon, 12 Jul 2010 18:08:43 +0000 (18:08 +0000)]
Get rid of cl_bob2up. It's not good for -sideways- movement
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10308
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d1da9bf067d77de10c307c7b27469b53af7a4fff
divverent [Mon, 12 Jul 2010 18:08:33 +0000 (18:08 +0000)]
Cvar description grammar fix :P
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10307
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fc5760b25234826c5c86beda38bd80bba0471a66
divverent [Mon, 12 Jul 2010 18:08:10 +0000 (18:08 +0000)]
Code, name and comment cleanups
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10306
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ed6472f89cf36e0c5d501c120bb027a7929a3f7e
divverent [Mon, 12 Jul 2010 18:08:00 +0000 (18:08 +0000)]
Center the effect, as this isn't the vertical bobbing
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10305
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
250091926db46a676ea0574165d9690b69227836
divverent [Mon, 12 Jul 2010 18:07:55 +0000 (18:07 +0000)]
Tweak a definition and cvar
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10304
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0a45cf0d32ebe9d360a5cb2a47a92878c037d86c
divverent [Mon, 12 Jul 2010 18:07:51 +0000 (18:07 +0000)]
Better name for the cvar set
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10303
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8e6ab24cdf43e59254de713c9103a3760f545926
divverent [Mon, 12 Jul 2010 18:07:40 +0000 (18:07 +0000)]
Remove the rolling in favor of the side-bobbing. I don't believe both effects would make sense to keep, and imo the side bobbing looks better than the rolling and simulates steps better. This can be reverted if anyone misses the rolling too much, but I don't think we need to load the code with both effects.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10302
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8ac958bd2673755fb1ea211e05cdcd65a3c6def6
divverent [Mon, 12 Jul 2010 18:07:10 +0000 (18:07 +0000)]
Better bounds for the view rolling, and fix a comment
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10301
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
853bfbcdcc848fcb54d465a52a61e8adf9ec3635
divverent [Mon, 12 Jul 2010 18:06:44 +0000 (18:06 +0000)]
Better bounds
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10300
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6df7f6ce7ad0accee0797b4de36ebfa5596512a8
divverent [Mon, 12 Jul 2010 18:06:24 +0000 (18:06 +0000)]
Sorry, this is more correct
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10299
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5fdb35816f2161df3b40945df5ecb1483340a2ab
divverent [Mon, 12 Jul 2010 18:06:04 +0000 (18:06 +0000)]
Add bounds. Tweak the bounds of the default bobbing as well (I hope this is alright, I tested the new values and they look good). Should allow more bobbing to be set from cvars.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10298
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ec392e33530b1b561859b88570e5997fe809792d
divverent [Mon, 12 Jul 2010 18:05:58 +0000 (18:05 +0000)]
Code cleanup, disable by default (set cl_bobside to 0.02 for optimal intensity, larger values to see the effect better). I think this can be considered ready and working :) Please post comments on http://forums.xonotic.org/showthread.php?tid=583&pid=8527
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10297
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
167ee4fde402a9ad5c54d10f49bac495d7387505
divverent [Mon, 12 Jul 2010 18:05:52 +0000 (18:05 +0000)]
Add a bobside_airtime like for the bobroll, to prevent the effect while in the air or bunny-hopping
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10296
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fd8761004020ecdbfa20668a0a2d13027cfa6366
divverent [Mon, 12 Jul 2010 18:05:47 +0000 (18:05 +0000)]
Make the sideways bobbing speed-based. Not ready but should be safe to use and test.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10295
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b96369b5d690f46439ef2dfc58ce4ec2e9f19209
divverent [Mon, 12 Jul 2010 18:05:44 +0000 (18:05 +0000)]
Code now in its place, but still doesn't work as indented
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10294
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d29ca462aec576b5eae570b7a25a93d88bdc111b
divverent [Mon, 12 Jul 2010 18:05:40 +0000 (18:05 +0000)]
Got the correct formula working. Code still not in place and doesn't do what it should, fixing that next.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10293
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
086be9db611541e7973b933d988884bbd64b90f4
divverent [Mon, 12 Jul 2010 18:05:21 +0000 (18:05 +0000)]
System to calculate the walking direction properly. The code is very dirty and not in the right place yet! Thanks parasti for the helpful suggestions.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10292
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
99b8706ce0e12f26f5373d7179f0c9160454b1fb
divverent [Mon, 12 Jul 2010 18:05:16 +0000 (18:05 +0000)]
Remove this, not needed
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10291
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
57c149962631c677ded8ce962c33bee04c3b7bd1
divverent [Mon, 12 Jul 2010 18:05:07 +0000 (18:05 +0000)]
Attempt to implement sideway view bobbing as well, for better simulation of steps (a copy of the current view bobbing code with its own cvars, meant to bob to the side of the player).
This is not ready yet! The commit before this is stable. Still trying to figure out how to make the X and Y axes both work as the player's side.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10290
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0895d56c3531cf7c7e63cd0951abdada67e0912b
divverent [Mon, 12 Jul 2010 18:04:55 +0000 (18:04 +0000)]
Suspend the effect when the jump button is pressed. Fixes the bunny-hopping twitches.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10289
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ccf707e6ac0c87b889065822691cde15b79da9de
divverent [Mon, 12 Jul 2010 18:04:36 +0000 (18:04 +0000)]
Slightly better cycle default
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10288
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ba50505a7c2b8bc1bf107feebef1ce668dfc1873
divverent [Mon, 12 Jul 2010 18:04:25 +0000 (18:04 +0000)]
Disable by default
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10287
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e32b8629025df7c28febdfd91c758c2b1b464b3b
divverent [Mon, 12 Jul 2010 18:04:14 +0000 (18:04 +0000)]
Use += instead. You never know what else might change the view roll someday :)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10286
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b1e3d16661ca0d3963d048b72ac7f7b0a24bf7af
divverent [Mon, 12 Jul 2010 18:04:07 +0000 (18:04 +0000)]
Set better defaults and fix final comments. I think this should be ready for testing and merging if approved.
NOTE: If anyone wishes to see the effect better, set cl_bobroll to a higher value (eg. 0.01)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10285
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b439868ab86c397b70f15db398787bae83b01cc6
divverent [Mon, 12 Jul 2010 18:03:54 +0000 (18:03 +0000)]
Optimize cvars
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10284
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d525103d7a27f1927db64a10f633392452ccce6b
divverent [Mon, 12 Jul 2010 18:03:42 +0000 (18:03 +0000)]
Cap speed to sv_maxspeed, so this looks right when bunny-hopping (makes more sense too)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10283
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b45e6c0be4b24d4dd5b5e127c08b0c9653051ca6
divverent [Mon, 12 Jul 2010 18:03:29 +0000 (18:03 +0000)]
Unground smoothing. The roll slowly returns to normal when untouching the ground.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10282
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2c3d1b84f0d1dd23435f50e84959bb8f02383136
divverent [Mon, 12 Jul 2010 18:03:12 +0000 (18:03 +0000)]
cl_bobroll should only be a switch
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10281
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f05848b5ccdb11025b285430be446376dc4508f4
divverent [Mon, 12 Jul 2010 18:03:02 +0000 (18:03 +0000)]
Fix centering, works exactly as intended now
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10280
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
91d848f0a2225b47721e2f0f55f1b2c57c5fbfed
divverent [Mon, 12 Jul 2010 18:02:44 +0000 (18:02 +0000)]
Use independent cycle float
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10279
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9b794c6c2fd84f72b5af95640b57f0253bafb27d
divverent [Mon, 12 Jul 2010 18:02:28 +0000 (18:02 +0000)]
Half fix TODO 2 with a simple check. The view doesn't roll when not touching the ground, but needs to return to 0 smoothly rather than instantly when you jump / fall.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10278
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1f02390d48f5d4e78d5867016e17e405fff33b31
divverent [Mon, 12 Jul 2010 18:02:20 +0000 (18:02 +0000)]
Attempt to implement Q4engine style bob-rolling (the view discretely rolls to the sides as you walk). Things to do before it is ready:
TODO 1: Make it work around the center rather than the left side
TODO 2: Don't bob roll when not touching the ground
TODO 3: Write cvars in darkplaces.txt, set better defaults and possibly disable by default once the first TODOs are ready.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10277
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e7307bf7059d55da536603a7e41dbefb5eb3a2b4
divverent [Wed, 7 Jul 2010 20:16:53 +0000 (20:16 +0000)]
fix font loading bug causing E0xx glyphs to get zero size
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10275
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b0b5a097bb79eec709eeafe8df062e8d47c6677e
divverent [Sun, 4 Jul 2010 19:49:03 +0000 (19:49 +0000)]
finalize DP_CSQC_BINDMAPS:
functions:
string(float key[, float bindmap]) getkeybind = #342;
float(float key, string bind[, float bindmap]) setkeybind = #630;
vector(void) getbindmaps = #631;
float(vector bm) setbindmaps(vector bm) = #632;
string findkeysforcommand(string command[, float bindmap]) = #610; /* DEPRECATED csqc: #521 */
string keynumtostring(float keynum) = #340; /* menu: #609, DEPRECATED csqc: #520 */
float stringtokeynum(string key) = #341; /* DEPRECATED menu: #614 */
The bindmap argument is OPTIONAL, and maybe should be declared as ... in the definitons.
The old alternative builtin numbers are hereby deprecated; they come from esteel's unofficial extension to csqc to provide findkeysforcommand with a different builtin number than the menuqc one, and from menuqc builtins that now are part of the "more official" csqc spec in other builtin number, apart from #609 in menuqc which was documented as part of menuqc before.
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10273
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
58ecffb6f73f96936bf8c21853570d7da483d0f3
divverent [Sun, 4 Jul 2010 19:49:00 +0000 (19:49 +0000)]
use a default bindmap of 0 in the PRVM commands, and the arg -1 means "current bindmap". Still need a QC way to get the current bindmap.
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10272
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a17b91f730ff2c4e8a2baf069f6eade29d566b2b
divverent [Sun, 4 Jul 2010 19:48:56 +0000 (19:48 +0000)]
make -1 as bindmap argument also work, to mean "current bindmap" (same as leaving out). Helps when the user wants to avoid the varargs declaration.
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10271
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a84f88eb529439276164e7b544d275fac5199767
divverent [Sun, 4 Jul 2010 19:48:53 +0000 (19:48 +0000)]
- fix a bug in Quake menu when in_bindmap was not "0 0"
- key bind editing QC builtins: add an optional second argument of the bindmap number to query
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10270
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ae7512c307941f96c1ec6506a63bbf48a1e1069f
divverent [Sun, 4 Jul 2010 19:44:08 +0000 (19:44 +0000)]
a simple time profiler for prvm_profile, cvar: prvm_timeprofiling
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10269
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
080a5e0773bf69f5e8132c7b5dc6e24b9e6e04b5
divverent [Fri, 2 Jul 2010 08:46:17 +0000 (08:46 +0000)]
fix minor typo in doc-string
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10265
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fb095018cbcd11dadb81dbb53ea29deb2a14e2df
havoc [Fri, 2 Jul 2010 02:44:03 +0000 (02:44 +0000)]
fix a crash in particlefont.txt parser when given no texcoords
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10264
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0cc6d620e59dc53d5162ff66c825b1655bf8cf06
havoc [Fri, 2 Jul 2010 02:39:31 +0000 (02:39 +0000)]
add DeviceLost and DeviceRestored functions to R_Modules system
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10263
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ac26fe8251232ec2eb02c89b9df3d07444063211
havoc [Fri, 2 Jul 2010 00:20:59 +0000 (00:20 +0000)]
grow svbsp allocation limit much faster (*16 rather than *2) to speed up
rtlight compiling on large lights
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10261
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
348bb3f9d788a3e1c606b501c612ef0716dbcb07
divverent [Thu, 1 Jul 2010 18:37:11 +0000 (18:37 +0000)]
new cvar r_draw2d to turn off all 2D drawing (except for console, r_speeds and showfps)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10259
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9a6cc5c4aa4cfcc90d86050f91d684704698c872
divverent [Thu, 1 Jul 2010 18:37:16 +0000 (18:37 +0000)]
a third console picture layer. NOW we should be able to do about anything remotely sensible with console backgrounds.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10260
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
45fd34eca407fe78f563575d0c0ecbb7827a1711
divverent [Wed, 30 Jun 2010 15:05:44 +0000 (15:05 +0000)]
menuqc += +VM_getkeybind, // #342 string(float keynum) getkeybind (EXT_CSQC)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10258
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9e2930c2fa043bbc2fe78735984fe6cc4d174534
divverent [Tue, 29 Jun 2010 14:47:18 +0000 (14:47 +0000)]
fix a cvar name typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10257
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2f8e9d0c3abae57bb2112ba24290a93f282adccd
divverent [Tue, 29 Jun 2010 14:46:47 +0000 (14:46 +0000)]
new cvars:
scr_conalpha2factor (relative alpha for gfx/conback2)
scr_conscroll_x (like tcmod scroll on console background)
scr_conscroll_y
scr_conscroll2_x (like tcmod scroll on second console background)
scr_conscroll2_y
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10256
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
67203ae490ac287981d04a4cec7dc11c9ff0169a
divverent [Tue, 29 Jun 2010 07:08:53 +0000 (07:08 +0000)]
fix getsurfaceneartexture() returning no useful data
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10255
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
394eb5f4bdb9bdca18a8a1ef5d7c85fd906ad72e
divverent [Tue, 29 Jun 2010 06:34:05 +0000 (06:34 +0000)]
speed up decal creation in newdecalsystem by using BIH for finding the affected triangles
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10254
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
09f884dd87cbb5b3da9e261d8c0841cdb9365c5b
havoc [Fri, 25 Jun 2010 14:05:05 +0000 (14:05 +0000)]
fix a warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10252
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0f0b19b509e71e991001841570e71cf5ef243470
havoc [Fri, 25 Jun 2010 14:03:32 +0000 (14:03 +0000)]
add surfaceindex to bih_leaf_t and initialize it
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10251
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
be40cd674833750c00c605009615f1d809a86c2a