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

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

projects / xonotic / darkplaces.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

divverent [Sat, 12 Nov 2011 11:17:38 +0000 (11:17 +0000)]

complexanimation now beginning to be suitable for SVQC use

- only set E5_COMPLEXANIMATION flag when required to save a LOT of bandwidth
- don't also send a legacy frame number when using complex animation to save a bit more
- no more support of "anims that start in the future", use a QC think function to handle them
- fix wraparound logic for complex animation (if a model animation is shorter than 30 sec, it won't jerk when playing the same anim for over a minute)

Bandwidth use per update message:
- simple anim: 1 byte
- 1 blends: 5 bytes
- 2 blends: 11 bytes
- 3 blends: 16 bytes
- 4 blends: 21 bytes
- skeletonobject: 4 + 12*bonecount bytes

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

commit | commitdiff | tree

havoc [Thu, 10 Nov 2011 17:05:43 +0000 (17:05 +0000)]

removed a model->numframes <= 1 check which broke animated models with a
single framegroup defined

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

commit | commitdiff | tree

havoc [Wed, 9 Nov 2011 19:39:40 +0000 (19:39 +0000)]

don't call ODE dWorldQuickStep with 0 step time

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

commit | commitdiff | tree

vortex [Wed, 9 Nov 2011 00:37:52 +0000 (00:37 +0000)]

DDS with DXT1a: was not correctly detected if r_texture_dds_load_alphamod == 0 (it does not really check for DDPF_ALPHAPIXELS), fixing.
ODE: physics_ode_constantstep now can be fractional, in this case ODE will run at this tickrate instead of using sys_ticrate, so ODE run at different framerate than server (may be useful for high values, such like running ODE at 100 fps and server at 40fps).

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

commit | commitdiff | tree

divverent [Tue, 8 Nov 2011 20:49:52 +0000 (20:49 +0000)]

1. make the first CSQC rendered view the "main" view, for use e.g. by origin display in r_speeds, prydon cursor, etc.
2. add an extension DP_CSQC_MAINVIEW to override DP's notion of the "main" view when necessesary

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

commit | commitdiff | tree

havoc [Tue, 8 Nov 2011 20:27:31 +0000 (20:27 +0000)]

allow time-based traileffectnum effects by passing frametime as count to
the particle effect, this means that a trail effect can use count rather
than trailspacing for a time-based effect

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

commit | commitdiff | tree

havoc [Tue, 8 Nov 2011 19:18:19 +0000 (19:18 +0000)]

remove physics_ode_worldstep cvar, it is now always dWorldQuickStep,
this should resolve problems with ode binaries from svn

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

commit | commitdiff | tree

havoc [Tue, 8 Nov 2011 19:17:40 +0000 (19:17 +0000)]

fix compile error (missing variable)

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

commit | commitdiff | tree

divverent [Tue, 8 Nov 2011 11:29:04 +0000 (11:29 +0000)]

explain that with pausable 0, the server admin still can pause

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

commit | commitdiff | tree

divverent [Tue, 8 Nov 2011 11:29:00 +0000 (11:29 +0000)]

allow listen server owner to pause the game (this also allows rcon pause)

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

commit | commitdiff | tree

divverent [Tue, 8 Nov 2011 13:25:56 +0000 (13:25 +0000)]

fix compile error regarding vid_sRGB declaration

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

commit | commitdiff | tree

divverent [Tue, 8 Nov 2011 11:29:06 +0000 (11:29 +0000)]

sRGB fallback: properly convert r_hdr_scenebrightness

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

commit | commitdiff | tree

divverent [Sun, 6 Nov 2011 19:43:34 +0000 (19:43 +0000)]

change framegroups parsing so the final EOL is optional

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

commit | commitdiff | tree

divverent [Sun, 6 Nov 2011 14:33:48 +0000 (14:33 +0000)]

fix two checks to not crash when showtex is used without a loaded worldmodel

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

commit | commitdiff | tree

divverent [Sun, 6 Nov 2011 14:24:59 +0000 (14:24 +0000)]

fix showtex

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

commit | commitdiff | tree

divverent [Sat, 5 Nov 2011 18:10:14 +0000 (18:10 +0000)]

fix OBJ models not getting any lighting

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

commit | commitdiff | tree

divverent [Sat, 5 Nov 2011 16:29:37 +0000 (16:29 +0000)]

refactoring to avoid doing the same mistake again (see HEAD^)

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

commit | commitdiff | tree

divverent [Sat, 5 Nov 2011 16:10:25 +0000 (16:10 +0000)]

sync _DrawQ_Setup to R_ResetViewRendering2D (they match except for extra parameters and min/max coordinates)

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

commit | commitdiff | tree

divverent [Sat, 5 Nov 2011 14:11:40 +0000 (14:11 +0000)]

eat unsupported tokens from framegroups file

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

commit | commitdiff | tree

divverent [Sat, 5 Nov 2011 14:04:12 +0000 (14:04 +0000)]

framegroups parsing: make 5th arg animation name, not comment

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

commit | commitdiff | tree

havoc [Fri, 4 Nov 2011 21:47:09 +0000 (21:47 +0000)]

fix crash in CL_ModelIndexList_f

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

commit | commitdiff | tree

Rudolf Polzer [Wed, 2 Nov 2011 14:40:25 +0000 (15:40 +0100)]

fix some va() use difference

commit | commitdiff | tree

Rudolf Polzer [Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)]

fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD

commit | commitdiff | tree

divverent [Wed, 2 Nov 2011 09:01:54 +0000 (09:01 +0000)]

mark 5 permutation bits eligible for moving to static parms

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

commit | commitdiff | tree

divverent [Wed, 2 Nov 2011 08:07:23 +0000 (08:07 +0000)]

win32: add two includes to make sure the constants for file mode and sharing are there

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

commit | commitdiff | tree

divverent [Wed, 2 Nov 2011 05:42:40 +0000 (05:42 +0000)]

fix some typos

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 14:45:57 +0000 (14:45 +0000)]

Command line: -sessionid, cvars: locksession, (R/O) sessionid

Allows games to require a session lock. Put "locksession 1" in the game's default config file and users then need to run instances with unique -sessionid parameter.

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

commit | commitdiff | tree

havoc [Tue, 1 Nov 2011 13:25:56 +0000 (13:25 +0000)]

fix an issue with glStencilFuncSeparate being misused (strange that I don't think I ever got a GL error on this before)
fixed deferred rendering in D3D9 renderer

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 12:22:59 +0000 (12:22 +0000)]

impact handling: instead of detecting teleports by origin or angles changing, detect teleports by calls to the setorigin() builtin

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 12:22:57 +0000 (12:22 +0000)]

speed up leaktest a bit

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 09:38:50 +0000 (09:38 +0000)]

VM_Warning should appear even if developer is 0.

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 11:30:21 +0000 (11:30 +0000)]

remove debug print

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 11:30:19 +0000 (11:30 +0000)]

more parsing fix

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 11:20:32 +0000 (11:20 +0000)]

fix a parsing issue for framegroups files

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

commit | commitdiff | tree

divverent [Tue, 1 Nov 2011 09:25:09 +0000 (09:25 +0000)]

turn "z value discarded" into VM_Warnings so one can backtrace them

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 08:35:12 +0000 (08:35 +0000)]

changed sv_fixedframeratesingleplayer logic a bit (now 10ms to 100ms per
frame as in original Quake), this cvar is off by default so it should
not be a concern

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 07:14:35 +0000 (07:14 +0000)]

UNMERGE! removed r_shadow_deferred_8bitrange cvar

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11496 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=7ebc321c860bd7705dd56ca2c5b2eb69babcee6e

commit | commitdiff | tree

havoc [Sun, 30 Oct 2011 02:55:30 +0000 (02:55 +0000)]

fix C++ compile error

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

commit | commitdiff | tree

havoc [Sun, 23 Oct 2011 22:52:12 +0000 (22:52 +0000)]

added USEDGA define, disabled by default, to suppress the xf86dga.h
deprecated warnings by not using the dga code anymore

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 07:57:35 +0000 (07:57 +0000)]

hit q1bsp sky as a solid in surface traceline

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 07:56:24 +0000 (07:56 +0000)]

undo the SUPERCONTENTS_SKY change, it should not be treated as solid,
instead the q1bsp loader should set SUPERCONTENTS_SOLID

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

commit | commitdiff | tree

havoc [Sat, 29 Oct 2011 07:27:10 +0000 (07:27 +0000)]

let traces hit sky by default, don't know why this wasn't in

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

commit | commitdiff | tree

divverent [Thu, 27 Oct 2011 07:08:50 +0000 (07:08 +0000)]

framegroups: add support for group names specified as // comment

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 07:14:35 +0000 (07:14 +0000)]

removed r_shadow_deferred_8bitrange cvar

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 07:01:42 +0000 (07:01 +0000)]

fix r_shadow_deferred total breakage from r11146

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 06:52:07 +0000 (06:52 +0000)]

fix dpmod shell casings spinning on the floor by disabling the
velocity-change-is-a-teleport logic in SV_PushEntity

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 06:14:49 +0000 (06:14 +0000)]

cleaned up SV_Physics_Toss code to be more maintainable

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

commit | commitdiff | tree

havoc [Mon, 31 Oct 2011 00:42:04 +0000 (00:42 +0000)]

added support for GL_EXT_packed_depth_stencil, this means that r_viewfbo
no longer breaks stencil shadows

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

commit | commitdiff | tree

havoc [Wed, 26 Oct 2011 22:57:31 +0000 (22:57 +0000)]

vid_soft_threads 8 by default because excessive threads doesn't hurt
low-core cpus very much and this helps high-core cpus a lot

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

commit | commitdiff | tree

havoc [Sat, 29 Oct 2011 07:10:46 +0000 (07:10 +0000)]

allow .psk models to be loaded without a corresponding .psa file

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

commit | commitdiff | tree

havoc [Sat, 29 Oct 2011 07:09:52 +0000 (07:09 +0000)]

less warning spew about non-existent frames in a model (developer_extra
is now checked) and also not warning about using a frame number on a
model with only one frame

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

commit | commitdiff | tree

havoc [Thu, 27 Oct 2011 21:07:34 +0000 (21:07 +0000)]

added USEREFLECTCUBE case to MODE_GENERIC, this disables use of texture
alpha on the first texture so that the motion blur compositing works
properly regardless of accumulated framebuffer alpha
fix USEGAMMARAMPS in HLSL because it was using an undeclared
dp_texture2D macro

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

commit | commitdiff | tree

divverent [Thu, 27 Oct 2011 19:59:02 +0000 (19:59 +0000)]

-demo and -capturedemo: don't quit if loading another demo, only quit when no more demos are started

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

commit | commitdiff | tree

divverent [Wed, 26 Oct 2011 09:07:21 +0000 (09:07 +0000)]

Linux dedicated server: set nice -19 while spawning server (can be turned off by -nonice option)

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

commit | commitdiff | tree

divverent [Tue, 25 Oct 2011 11:14:32 +0000 (11:14 +0000)]

HMAC: remove static vars

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

commit | commitdiff | tree

havoc [Mon, 24 Oct 2011 09:42:37 +0000 (09:42 +0000)]

fix Collision_ClipTrace_Line_Sphere calculation of impactdist (had a
discussion about this previously but forgot the solution, now reminded)

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

commit | commitdiff | tree

divverent [Sun, 23 Oct 2011 15:53:12 +0000 (15:53 +0000)]

fix a sRGB conversion in effectinfo handling

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

commit | commitdiff | tree

havoc [Sat, 22 Oct 2011 22:28:04 +0000 (22:28 +0000)]

use checkdisk flag on model loading after ingame download, this should
eliminate the need for r_restart

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

commit | commitdiff | tree

havoc [Sat, 22 Oct 2011 00:01:07 +0000 (00:01 +0000)]

don't crash when .clientcamera is set on a botclient

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

commit | commitdiff | tree

divverent [Sat, 22 Oct 2011 16:00:16 +0000 (16:00 +0000)]

fix factors in sRGBlightmaps code

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

commit | commitdiff | tree

divverent [Sat, 22 Oct 2011 15:28:56 +0000 (15:28 +0000)]

fix image loading sRGB conversion

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

commit | commitdiff | tree

divverent [Sat, 22 Oct 2011 15:08:47 +0000 (15:08 +0000)]

more sRGB simplification

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

commit | commitdiff | tree

divverent [Sat, 22 Oct 2011 14:19:37 +0000 (14:19 +0000)]

a harmless sRGB simplification, more to be done later

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

commit | commitdiff | tree

divverent [Fri, 21 Oct 2011 11:09:48 +0000 (11:09 +0000)]

use the correct sRGB conversion for the gamma ramps

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

commit | commitdiff | tree

divverent [Fri, 21 Oct 2011 10:23:12 +0000 (10:23 +0000)]

fix another typo in sRGB conversion

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

commit | commitdiff | tree

divverent [Fri, 21 Oct 2011 10:12:43 +0000 (10:12 +0000)]

make sRGB conversions match entirely with GL_EXT_texture_sRGB spec

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

commit | commitdiff | tree

divverent [Wed, 19 Oct 2011 07:33:08 +0000 (07:33 +0000)]

fix a compile error in recent bloom changes

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

commit | commitdiff | tree

divverent [Fri, 21 Oct 2011 09:59:59 +0000 (09:59 +0000)]

option: mod_q3bsp_sRGBlightmaps (experimental)

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

commit | commitdiff | tree

divverent [Fri, 21 Oct 2011 04:41:30 +0000 (04:41 +0000)]

vid_sRGB_fallback: now 3 is unconditional, and 2 also falls back if framebuffer is 8bit (I know this detection breaks when toggling r_viewfbo at runtime, don't care, people shall do vid_restart)

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:37 +0000 (17:40 +0000)]

make the sRGB fallback cvar controlled (and off by default)

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:36 +0000 (17:40 +0000)]

fix parts of the sRGB emulation

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:34 +0000 (17:40 +0000)]

sRGB: also handle sRGB for loading DDS textures

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:31 +0000 (17:40 +0000)]

sRGB: also convert vertex colors

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:30 +0000 (17:40 +0000)]

rename the function

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

commit | commitdiff | tree

divverent [Thu, 20 Oct 2011 17:40:28 +0000 (17:40 +0000)]

convert lightmaps to sRGB for nice sRGB support

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

commit | commitdiff | tree

eihrul [Tue, 18 Oct 2011 07:56:03 +0000 (07:56 +0000)]

make R_SetupView take view size from fbo textures if available

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

commit | commitdiff | tree

eihrul [Tue, 18 Oct 2011 07:14:43 +0000 (07:14 +0000)]

fix fbo var name bug in R_DrawModelShadowMaps

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

commit | commitdiff | tree

divverent [Tue, 18 Oct 2011 07:00:38 +0000 (07:00 +0000)]

fix one C++ compile error. It looks like we have no more wrong declaration of function issues, as C++ name mangling should have detected them.

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

commit | commitdiff | tree

divverent [Tue, 18 Oct 2011 06:58:29 +0000 (06:58 +0000)]

move these declarations to where they belong

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

commit | commitdiff | tree

eihrul [Tue, 18 Oct 2011 06:52:23 +0000 (06:52 +0000)]

fix R_DrawModelShadows/R_DrawModelShadowMaps prototypes not matching definitions

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

commit | commitdiff | tree

havoc [Mon, 17 Oct 2011 17:00:10 +0000 (17:00 +0000)]

reworked collision cache to only be used by bouncegrid and only in
dynamic mode (static mode no longer causes several heart attacks in the
collision cache as it executes many times the regular amount of traces)

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

commit | commitdiff | tree

havoc [Mon, 17 Oct 2011 11:16:53 +0000 (11:16 +0000)]

init/shutdown thread system in dedicated server as well

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

commit | commitdiff | tree

divverent [Sun, 16 Oct 2011 14:17:50 +0000 (14:17 +0000)]

properly detect vid.samples value if overridden by driver

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 13:50:53 +0000 (13:50 +0000)]

if vid_samples is > 1 then do not use fbo view or water renders

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 12:49:59 +0000 (12:49 +0000)]

fix motionblur with r_viewfbo 2 or 3

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

commit | commitdiff | tree

divverent [Sun, 16 Oct 2011 12:39:10 +0000 (12:39 +0000)]

for now, turn off FBO if multisampling as their combination is not implemented yet

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 09:57:08 +0000 (09:57 +0000)]

added r_water_fbo cvar to enable fbo rendering of water by default
regardless of r_viewfbo

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 09:54:40 +0000 (09:54 +0000)]

removed cvars r_hdr and r_hdr_range - now the only way to get HDR
rendering is using r_viewfbo 2 (which is faster and nicer)
implemented fbo rendering for water, bloom and gamma, setting r_viewfbo
to 1 gives a consistent speed gain because it avoids all texture copies

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 09:38:54 +0000 (09:38 +0000)]

overhauling a lot of functions to allow fbo rendering

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 09:11:52 +0000 (09:11 +0000)]

renamed r_bloomstate to r_fb because it contains framebuffer settings
moved r_waterstate to r_fb.water

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

commit | commitdiff | tree

havoc [Mon, 17 Oct 2011 17:19:28 +0000 (17:19 +0000)]

fix more crashes to do with animscenes being NULL on some models,
audited all the isanimated lines

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

commit | commitdiff | tree

havoc [Mon, 17 Oct 2011 17:07:41 +0000 (17:07 +0000)]

added sv_disablenotify cvar (default 1) to suppress prints about
CVAR_NOTIFY cvars changing

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

commit | commitdiff | tree

havoc [Mon, 17 Oct 2011 12:02:53 +0000 (12:02 +0000)]

allow terminal input on sdl client as well (glx client already does)

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

commit | commitdiff | tree

divverent [Mon, 17 Oct 2011 11:07:20 +0000 (11:07 +0000)]

new cvar: cl_maxphysicsframesperserverframe

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 18:26:06 +0000 (18:26 +0000)]

fix byte color handling in iqm loader

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 08:55:06 +0000 (08:55 +0000)]

oops, missed this

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

commit | commitdiff | tree

havoc [Sun, 16 Oct 2011 08:50:13 +0000 (08:50 +0000)]

added cvar r_water_hideplayer with 3 possible values (can hide from
nothing, refraction, or refraction and reflection)
renamed r_waterstate.renderingrefraction to r_waterstate.hideplayer

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

commit | commitdiff | tree

havoc [Sat, 15 Oct 2011 00:19:54 +0000 (00:19 +0000)]

fix two crashes that divVerent found and fixed but didn't commit

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

commit | commitdiff | tree

havoc [Fri, 14 Oct 2011 08:28:45 +0000 (08:28 +0000)]

fix crashes with last patch to model loaders
load vertex colors in iqm model format if they exist (can be accessed in
GLSL Shaders)

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

commit | commitdiff | tree

havoc [Fri, 14 Oct 2011 06:18:08 +0000 (06:18 +0000)]

allow iqm models without geometry
allow iqm models without animation
compute model->surfmesh.isanimated and model->AnimateVertices in a
better way to make sure static models are identified as such (if bones
is 0 or 1, and no animation frames, treat as static)

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