]>
git.xonotic.org Git - xonotic/darkplaces.git/log
eihrul [Mon, 12 Apr 2010 07:38:54 +0000 (07:38 +0000)]
IQM loading animation frames fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10076
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8e7b8eb13cb7951196a0acb18e80199a0600472a
havoc [Sun, 11 Apr 2010 20:52:35 +0000 (20:52 +0000)]
fix some warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10075
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
339ca3303eb66470182114ab0afbac3a91aa71e9
havoc [Fri, 9 Apr 2010 18:59:41 +0000 (18:59 +0000)]
patch from Ozkan Sezer for compatibility with mingw64 (changed #include
order)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10074
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7bbad4b218ce0d4d73ade493cb9baf495112f39d
divverent [Thu, 8 Apr 2010 06:39:33 +0000 (06:39 +0000)]
Put the Thanks block in the readme at the end, where it belonged. My bad for adding something after it some months (or years?) ago.
This commit has sharp edges. Also,
diff -u a/r10072.txt b/r10072.txt
--- a/r10072.txt 2010-04-08 08:35:55.
619618796 +0200
+++ b/r10072.txt 2010-04-08 08:37:38.
417107779 +0200
@@ -1,5 +1,5 @@
Fix a premature optimization in Mod_CollisionBIH_TraceLine, which broke tZork's test case.
-As Bjarne Stroustrup said, "Premature optimization is the root of all evil."
+As Donald Ervin Knuth said, "Premature optimization is the root of all evil."
BIH collision might actually WORK now.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10073
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63cbc16c0a8dd2fcffc9eaffc04c488c36013391
divverent [Thu, 8 Apr 2010 06:19:54 +0000 (06:19 +0000)]
Fix a premature optimization in Mod_CollisionBIH_TraceLine, which broke tZork's test case.
As Bjarne Stroustrup said, "Premature optimization is the root of all evil."
BIH collision might actually WORK now.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10072
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb9c296b12ebe165cadf59d810495b92c676e21b
eihrul [Wed, 7 Apr 2010 23:44:10 +0000 (23:44 +0000)]
make IQM loading import animation sequences rather than individual frames (thus not requiring framegroups anymore)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10071
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
60273d70b86488ca6d9fba7f069eb7ec37ae50ed
vortex [Wed, 7 Apr 2010 19:16:19 +0000 (19:16 +0000)]
additional <start_position> parm to "cd play" and "cd loop", could be useful with DP_QC_GETTIME_CDTRACK
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10070
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2331b1c3d65e6ce6742eb8504feefcf4b6afb871
divverent [Mon, 5 Apr 2010 13:47:58 +0000 (13:47 +0000)]
1. network sv_gameplayfix_gravityunaffectedbyticrate to the client, and predict properly
2. new cvar sv_gameplayfix_nogravityonground (also supported by cl_movement)
When that cvar is activated, walking on downward slopes is a little bumpy.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10069
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9b64f9e9a888f325fb7499271bb0098ac4f07da1
havoc [Sun, 4 Apr 2010 23:28:13 +0000 (23:28 +0000)]
use multiple prints for ProQuake compatibility in status commands
(default layout only)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10068
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a958e8cfe4940aaceefe6a66b0a2ff38f85b89f3
havoc [Sun, 4 Apr 2010 23:20:56 +0000 (23:20 +0000)]
use 3 spaces before IP address in status output, not 2, must be proquake
compatible
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10067
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
39bfcfff4347f25d44f61a9520d6733abef54262
havoc [Sun, 4 Apr 2010 23:14:40 +0000 (23:14 +0000)]
change representation of string offsets for allocated strings and engine
buffers to use 0x4000000 as base offset instead of using negative
values, to reduce possibility of && and || operators (which do float
compares to 0 in the vm) breaking on string variables
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10066
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d0129de1a042fd4244533d2a25663259588a1f8f
havoc [Sun, 4 Apr 2010 01:52:46 +0000 (01:52 +0000)]
looks like there was a missing return in VM_M_getserverliststat
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10065
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
abcd5576e13a2b419d154e63125acfdaffd3d037
havoc [Sat, 3 Apr 2010 22:40:43 +0000 (22:40 +0000)]
disable sv_gameplayfix_consistentplayerprethink by default because it
breaks id1 multiplayer (important!)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10064
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a8b4670366bab5ba6db74beced05f510e456ac66
divverent [Mon, 29 Mar 2010 15:27:13 +0000 (15:27 +0000)]
APPEND forced args, not PREPEND, as earlier arguments win in most DP options.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10063
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5c095672f598f0ee564c9926a53d0f03ab6aa382
havoc [Thu, 18 Feb 2010 04:36:46 +0000 (04:36 +0000)]
changed default value of mod_collision_bih from 0 to 1 because it seems
fine but more testing is needed (and nothing gets tested if it has to be
done manually)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9979
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e396b8ef9124bd32289b3ea06d80831fa72189f0
divverent [Mon, 29 Mar 2010 07:43:07 +0000 (07:43 +0000)]
custom branding:
like:
-nexuiz -customgamename Offendix -customgamedirname1 offendix -customgamedirname2 "" -customgamescreenshotname offendix -customgameuserdirname offendix
in an attached-to-the-executable darkplaces.opt
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10062
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7af68c919f5636fd9dc234c6729fe17db24835f9
divverent [Sat, 27 Mar 2010 13:08:42 +0000 (13:08 +0000)]
fix 6ch channel layout in SDL on Linux (it no longer uses SND_CHANNELLAYOUT_ALSA)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10061
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
42a84a82462e7bf863438e2729cc902aad7258c0
divverent [Fri, 26 Mar 2010 11:42:05 +0000 (11:42 +0000)]
new %v conversion in sprintf (uses %g conversions to build a vector)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10060
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bd3ce6ba057962a8cd4dd002312e91a6347d847b
divverent [Fri, 26 Mar 2010 11:42:01 +0000 (11:42 +0000)]
use the safer %.9g format for storing floats e.g. in savegame or prvm_edict command (which is read back in properly)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10059
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
38366cab6fb7cc06829c562fa8e9a63f9cc5ae2a
divverent [Fri, 26 Mar 2010 11:41:58 +0000 (11:41 +0000)]
host_maxwait cvar to possibly work around timing trouble regarding broken nanosleep etc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10058
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a73023e52fa467f9013901a387214c95ee470de8
Rudolf Polzer [Sat, 20 Mar 2010 13:41:41 +0000 (14:41 +0100)]
divverent [Thu, 18 Mar 2010 19:20:33 +0000 (19:20 +0000)]
make model decompiling more robus regarding anim names (if name is pain1_4, treat this as pain1 frame 4, not pain frame 1_4)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10057
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0dbad969a9fb88de32f308d156bbd049cb8ecbf5
havoc [Thu, 18 Mar 2010 03:45:40 +0000 (03:45 +0000)]
make q3 shader settings work on dedicated servers (dpmeshcollisions for
example)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10056
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
20bd5f5185559d8a076ffed26c574b367d6f563a
divverent [Sun, 14 Mar 2010 19:20:30 +0000 (19:20 +0000)]
sv_curl_maxspeed: maximum speed for the curl downloads recommended by this server (incompatible with clients not having this commit, so do not use yet)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10055
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
03306bdd4418fa1db27901218887856adb573fbc
divverent [Sun, 14 Mar 2010 18:08:39 +0000 (18:08 +0000)]
fix how plural of alias works
wrong: sg. aliases, pl. aliasess
right: sg. alias, pl. aliases
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10054
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
896e0268d767b3c9326b980c06af52e7d61828aa
divverent [Sat, 13 Mar 2010 18:27:09 +0000 (18:27 +0000)]
modeldecompile: also write a framegroups file if possible
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10053
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b49d45860ccf831906d99bfc660a063e646a0b28
eihrul [Sat, 13 Mar 2010 18:08:41 +0000 (18:08 +0000)]
made IQM framerate a float
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10052
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c7b1d8b1697106c4a3616e0c09aef5e85ca7b39a
divverent [Sat, 13 Mar 2010 16:31:58 +0000 (16:31 +0000)]
randomized loadingscreen pic (cvar: scr_loadingscreen_count, when 2 or above, randomized gfx/loading{,2-n} pic is used, not recommended for general use as it costs GPU memory)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10051
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
077ab7429f22daaf1cf6c9cb4801127444eecbe7
eihrul [Tue, 9 Mar 2010 02:58:06 +0000 (02:58 +0000)]
fixes for entity caching when r_shadows == 1
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10050
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4a3affb575ba8f4473eafcf58f02ac13788bf120
eihrul [Tue, 9 Mar 2010 02:51:39 +0000 (02:51 +0000)]
use stencil shadows if r_shadows == 1
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10049
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d58035349558ffa4f33dff870841179624296c93
havoc [Tue, 9 Mar 2010 02:17:08 +0000 (02:17 +0000)]
okay, don't use shadow sampler in Cg
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10048
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
826cff55f504e6b50ebb4eed1575e2d3380fbfeb
eihrul [Tue, 9 Mar 2010 02:03:47 +0000 (02:03 +0000)]
fixed bug in vsdct in cg
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10047
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7c005bf5b1582ad7e401f71291539d8ad6b2c734
havoc [Tue, 9 Mar 2010 01:59:20 +0000 (01:59 +0000)]
change texcoord assignments in Cg shader back to the way it was, because
there was a conflict on TEXCOORD5 in one situation
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10046
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a60992ad5c588e3116dcdcd94fab3ff3f47b0ba7
eihrul [Tue, 9 Mar 2010 01:44:20 +0000 (01:44 +0000)]
fixed ShadowMap_Parameters usage in GetShadowMapTCCube in builtincgshaderstring
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10045
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
95c9b0567355d75bd06b6e6d970453f744824ea1
havoc [Tue, 9 Mar 2010 01:33:41 +0000 (01:33 +0000)]
implemented a new type of height fog using a texture to describe
multiple fog layers, some visual issues due to the method used.
new command and worldspawn property - identical extra for a new
texturename parameter at the end
fixed some issues with shadowmapping in Cg shaders
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10044
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b2d45dd172990008ff2fefa83cc24243b39cafae
eihrul [Mon, 8 Mar 2010 08:50:03 +0000 (08:50 +0000)]
IQM base pose cleanups
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10043
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
286eef4523881589b16fc01f3018e1d0bcad85ca
eihrul [Mon, 8 Mar 2010 05:16:27 +0000 (05:16 +0000)]
more IQM loading fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10042
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
56eae4d377de01abc73974a1f4c92de714e2d741
eihrul [Mon, 8 Mar 2010 03:08:08 +0000 (03:08 +0000)]
misc IQM loading fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10041
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63d72af7573ba79f1c8f5cfd95cdafa5bd9a0f1f
eihrul [Mon, 8 Mar 2010 02:30:20 +0000 (02:30 +0000)]
added per frame bounds to IQM format
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10040
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb2c130be91caa03854a18721bf7b5821cb5b9da
eihrul [Sun, 7 Mar 2010 21:50:15 +0000 (21:50 +0000)]
build IQM inverse base pose from joints if necessary
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10039
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1758371577bf14719f55b96d613055d06a421996
eihrul [Sun, 7 Mar 2010 21:13:06 +0000 (21:13 +0000)]
experimental IQM model format support
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10038
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3797d3256c2b3eebe81d26845ee7ba205be417df
divverent [Sat, 6 Mar 2010 15:37:45 +0000 (15:37 +0000)]
properly support huge sideways friction
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10037
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fb50a9a778603419fe35c6c6fbb018b3bcff7783
eihrul [Sun, 28 Feb 2010 20:52:44 +0000 (20:52 +0000)]
cast Mem_Allocs in FS_Init_SelfPack
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10036
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c71853932342a49f005a07537d1694becf72de23
divverent [Sun, 28 Feb 2010 19:35:36 +0000 (19:35 +0000)]
WarpZones:
- entities with a camera_transform function field
arguments: vector origin, vector angles
global input: v_forward, v_right, v_up = camera orientation
return value: new origin
global output: v_forward, v_right, v_up = new camera orientation
global output: trace_endpos = origin on "remote side" for culling purposes
- on server, only the trace_endpos return value is used, and '0 0 0' angles are passed, and only the trace_endpos is used (this may be subject to change)
- a warpzone is an above described entity that contains a surface of a shader that uses the keywords dp_camera AND dp_refract
- a camera is an above described entity that contains a surface of a shader that JUST uses the keyword dp_camera
- in case of a camera, preferably the camera_transform function shall not use the input values (except for use for certain special effects)
- rendering of these warpzones is not recursive (yet)
- the warpzones do not have any impact on gameplay - QC support code is needed both on client and server
- example support code will be committed to Nexuiz SVN
- the interface is not stable yet and may be subject to change
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10035
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f2467d484c38a13d23bb92f91c19a9d6a71f7bec
divverent [Sun, 28 Feb 2010 19:10:37 +0000 (19:10 +0000)]
Detect appended data to the DP executable.
If it's a pk3, it is added FIRST (TODO: should this be LAST) into the search path.
If it contains a darkplaces.opt text file, its contents are parsed and used as extra command line arguments.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10034
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
43ccc403e08b7b72eb687f2d3700e14ea078d30a
eihrul [Sat, 27 Feb 2010 23:30:08 +0000 (23:30 +0000)]
GetShadowMapTCCube fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10033
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
15efe8a29cd13659eec237299fde9617f5d20247
havoc [Sat, 27 Feb 2010 21:12:40 +0000 (21:12 +0000)]
fix a bug that prevented coronas from being rendered for lights with no
diffuse or specular intensity
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10032
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ce0c7106ab28f380d916b1822ffbcb76ba6bd9c8
havoc [Sat, 27 Feb 2010 21:11:04 +0000 (21:11 +0000)]
fix bug that prevented reflection cubemaps from working with Cg shaders
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10031
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cffd12690851e3d5c43e60698eac4222830b7df0
havoc [Sat, 27 Feb 2010 21:10:42 +0000 (21:10 +0000)]
don't apply motionblur when rendering to an envmap
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10030
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c678ac88ae44d7ee40e4706f107c481426179642
havoc [Sat, 27 Feb 2010 21:10:14 +0000 (21:10 +0000)]
use a larger triangle buffer for r_batchmode 2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10029
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a12c43a681e2f505913b315ca8d8311c31cdd1f7
havoc [Sat, 27 Feb 2010 21:08:14 +0000 (21:08 +0000)]
minor cleanup to R_DrawSurface_TransparentCallback
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10028
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fc2df393e29803fad1ac52a0dabdbe797800829f
havoc [Sat, 27 Feb 2010 18:31:15 +0000 (18:31 +0000)]
changed r_speeds labels again, less csqc monitoring and more consistent
label order from frame to frame
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10027
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3d164924a905fa9a5486f412fd1df10c3c3e9edf
divverent [Sat, 27 Feb 2010 18:11:31 +0000 (18:11 +0000)]
make some cvars static, to help the compiler a bit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10026
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
51a8ca23ba62e2519baae1df8f8a77b694db9619
havoc [Sat, 27 Feb 2010 18:09:54 +0000 (18:09 +0000)]
added cl_prydoncursor_notrace cvar
added support for cl_prydoncursor < 0 as no visible cursor
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10025
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63f2f2422398cd79dedcefcf9fbd14421841396f
divverent [Sat, 27 Feb 2010 18:08:26 +0000 (18:08 +0000)]
try to fix all project files (to add winmm)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10024
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
44060cc000b60519aa9366cc77b45743b891b330
divverent [Sat, 27 Feb 2010 18:02:50 +0000 (18:02 +0000)]
shut up a (in this case wrong) warning about possibly uninitialized variable
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10023
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a2e0eb0507761bef44937588ae65a8591aca9a1
divverent [Sat, 27 Feb 2010 18:01:33 +0000 (18:01 +0000)]
add -lwinmm to win32 sdl
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10022
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
07bfdec5c59acb2ea389da4a6601a1cbf929214b
divverent [Sat, 27 Feb 2010 16:39:44 +0000 (16:39 +0000)]
yet another include fix, this time for MSVC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10021
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1d1caba2d497ad87c45fafa11e39e20d9c5fa4a7
divverent [Sat, 27 Feb 2010 15:12:13 +0000 (15:12 +0000)]
another include
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10020
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f1f794cceaae1a0687140f9a0c88eff3e858271a
divverent [Sat, 27 Feb 2010 15:09:43 +0000 (15:09 +0000)]
attempt to fix the includes for win32
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10019
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
715d02cb31a0bf038288cd3a04372c959ea2648c
divverent [Sat, 27 Feb 2010 15:07:21 +0000 (15:07 +0000)]
fix another win32 time typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10018
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
83999e441c2aee1fc3b940c890597d15b5d72663
divverent [Sat, 27 Feb 2010 15:04:07 +0000 (15:04 +0000)]
fix two remaining uses of sys_usetimegettime
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10017
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
95ea7cd538122ca0fc56dec276c6900ef47ae56d
divverent [Fri, 26 Feb 2010 15:44:03 +0000 (15:44 +0000)]
also: sys_usesdldelay for using SDL_Delay() for sleeping instead of something better system provided
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10014
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bf7b5f9f849025aaa0b3c2321b6e1fc9988cc63b
divverent [Fri, 26 Feb 2010 15:43:58 +0000 (15:43 +0000)]
refactor timing, so that timing code is in sys_shared.c.
Changes in behaviour: Win32 now prefers select() (PLEASE TEST), SDL timers can be overridden by sys_usequeryperformancecounter or sys_useclockgettime, new cvar sys_debugtime
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10013
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
913039faa5b22651954fe10a148ff1e87e4b84fd
divverent [Fri, 26 Feb 2010 15:43:54 +0000 (15:43 +0000)]
Revert "added linux timing code to SDL client for more accurate r_speeds reports"
This reverts commit
ef4adee42c844523c889cbc6c19d2da940f00ec6 .
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10012
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
abc8a1eeeedc13556c83ba40d5d33d996a66dddd
havoc [Fri, 26 Feb 2010 13:58:35 +0000 (13:58 +0000)]
added linux timing code to SDL client for more accurate r_speeds reports
(sys_usetimegettime and sys_useclockgettime apply, set both to 0 to use
SDL_GetTicks instead)
added support for sys_usenoclockbutbenchmark in SDL client
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10011
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef4adee42c844523c889cbc6c19d2da940f00ec6
havoc [Fri, 26 Feb 2010 12:03:37 +0000 (12:03 +0000)]
undo an edit in r9537 that caused it to be possible to walk through a
narrow gap in toxic in Nexuiz near the rocket launcher
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10009
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fa8c2da3b1ce02a796fafd6fc91f7a7f50d1fb5e
havoc [Fri, 4 Dec 2009 16:13:26 +0000 (16:13 +0000)]
fixed a bug with sv_gameplayfix_nudgeoutofsolid where the player might
get put on the opposite side of a brush because of being very near the
plane that should be used for nudging, which caused it not to be
considered as a nudging plane
added some checks to ensure more consistency on trace direction (should
be able to swap start and end without startsolid trouble, at least less)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9537
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5b7ac1706712977bbc0297d2d53294e73574c7cd
eihrul [Sat, 27 Feb 2010 02:04:38 +0000 (02:04 +0000)]
added 6x6 pcf option for people with too much framerate
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10016
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e3a883b6057a6bf3e4105e2f127576a5142a73cc
divverent [Fri, 26 Feb 2010 20:32:24 +0000 (20:32 +0000)]
fix strstrofs with unicode
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10015
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7310ccc56ef9562bac8d52df25ed47b826c02a49
havoc [Fri, 26 Feb 2010 12:30:07 +0000 (12:30 +0000)]
don't bother calling Collision_ValidateBrush when creating box brushes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10010
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
26c627af105b03b2e1f5d74279163712ea546749
havoc [Thu, 25 Feb 2010 23:10:15 +0000 (23:10 +0000)]
added collision_debug_tracelineasbox cvar to work around problems with
traceline on q3bsp, disabled by default due to performance being worse
but should aid in debugging the traceline problems
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10008
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
af7e237a4e6bdaab9a340a61a76ea314dff5624a
eihrul [Thu, 25 Feb 2010 18:47:26 +0000 (18:47 +0000)]
magical instruction sequence that works on both GL_ARB_texture_gather and GL_AMD_texture_texture4
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10007
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
23dca6dfc6b7d92aa2f12dc50fa6e18c85b3895a
havoc [Thu, 25 Feb 2010 16:16:46 +0000 (16:16 +0000)]
added dpmeshcollisions keyword in shader parsing, this causes all
rendering triangles of the affected surfaces to be added to the BIH
system, so that q3map2's misc_model collision flag can be turned off,
greatly reducing bsp size and memory usage, as well as possibly
improving collisions (no need to reconstruct points from planes)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10006
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63bd4cc6bae869cbcd1ef49d27687184c9168fb0
havoc [Thu, 25 Feb 2010 16:14:13 +0000 (16:14 +0000)]
make sure r_glsl_permutation and r_cg_permutation variables are NULL
when renderer is started or shuts down
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10005
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
81635076d3f07502c9364aa258a08eb51913ba7b
eihrul [Thu, 25 Feb 2010 16:12:37 +0000 (16:12 +0000)]
attempting workaround for coord rounding incompatibilities between GL_ARB_texture_gather (nvidia) and GL_AMD_texture_texture4 (ati)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10004
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
34690453e94ce3bf4f752699efd64f97686fc1d1
havoc [Thu, 25 Feb 2010 16:11:50 +0000 (16:11 +0000)]
fix crash when MAX_DLIGHTS is hit and a trail effect tries to add a
dlight
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10003
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
87af9c2ada6e612040e77f1291f75c5ff15ae031
havoc [Thu, 25 Feb 2010 16:11:13 +0000 (16:11 +0000)]
particle geometry can now be rotated for more variety, and can spin too
added rotate command in effectinfo.txt which specifies min/max starting
angle and min/max rotation speed (spin)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10002
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bb92f370420bd006ad8b5e5eceb25439a4c9b429
havoc [Thu, 25 Feb 2010 16:01:54 +0000 (16:01 +0000)]
use CONFIGFILENAME and STARTCONFIGFILENAME macros instead of config.cfg
and quake.rc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10000
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b530da0ed507718834d845824a344c7a0d14cfcf
havoc [Thu, 25 Feb 2010 15:58:10 +0000 (15:58 +0000)]
added cl_particles_collisions cvar to allow collisions to be turned off
for performance testing
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9999
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
30b08d7326179215b9ba0d2964aacfdfb07e1f58
havoc [Thu, 25 Feb 2010 15:55:47 +0000 (15:55 +0000)]
add several more R_TimeReport calls for better analysis of csqc time
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9998
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
88d7d61be53c082f488ce7e1f25de1e095ed4fdf
havoc [Thu, 25 Feb 2010 15:50:24 +0000 (15:50 +0000)]
don't bother calling Mod_ForName in client precache parsing if server
already loaded them in a local game
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9997
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f170ee3a587ffab1f06680de213b033838cb0b8a
havoc [Thu, 25 Feb 2010 07:32:04 +0000 (07:32 +0000)]
changes to rtlight surface culling:
SVBSP culling mode now also checks PVS (not sure why this helps)
no longer rejects backfaces in light culling (fixes several glitches in
start.bsp and elsewhere - not sure why the light would be considered
behind these triangles though)
optimized svbsp building conditions a bit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9996
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9daa8124711b6014029dc4d08d5b9ceefc6207e0
eihrul [Thu, 25 Feb 2010 06:31:44 +0000 (06:31 +0000)]
fix signed vs. unsigned comparison warning in GL_TextureMode_f
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9995
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d032cfb5ca1e47238f2bd96886793c21547f0605
vortex [Sun, 21 Feb 2010 01:52:02 +0000 (01:52 +0000)]
Offsetmapping now could be customized on per-texture basis. Added mod_q3shader_default_offsetmapping cvar which is 1 by default (offsetmapping is on by default on all surfs), and 0 (only shader-set). New q3shader keyword "dp_offsetmapping <type> <scale>". Typical example: "dp_offsetmapping default 2". Types are "off", "default" (legacy cvar-based behavior), "linear" and "relief". Linear/relief is forced modes that ignores r_glsl_offsetmapping_reliefmapping.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9993
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7995f9f34c59e9f4a33a549d5bee58c5af43ea11
divverent [Mon, 22 Feb 2010 18:33:57 +0000 (18:33 +0000)]
fix degenerate triangle elimination
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9994
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a90442567b871a66f6e70e4747ea5ebf9be43bce
motorsep [Sat, 20 Feb 2010 18:31:50 +0000 (18:31 +0000)]
+some tune ups for Steel Storm screenshot prefix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9992
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
293060f59a848ee45283a35bff42c8d606673f14
havoc [Sat, 20 Feb 2010 14:03:14 +0000 (14:03 +0000)]
fixed BIH line clipping and enabled it, BIH is now faster than BSP
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9991
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c02ebe7d779742be5ab23638b5f29c9da715d797
havoc [Sat, 20 Feb 2010 13:31:40 +0000 (13:31 +0000)]
slight improvement to BIH recursion speeds by checking for box overlap
on every node (in addition to the side check)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9990
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
969efaea336f33793b6c35cea05f595f4d9e0f03
havoc [Sat, 20 Feb 2010 12:42:59 +0000 (12:42 +0000)]
added server and client timing data to r_speeds 2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9989
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dfe5470e06bc2b567cf21f1e3bea24567e901094
havoc [Fri, 19 Feb 2010 15:10:54 +0000 (15:10 +0000)]
fix more cg shader errors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9988
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cac93010a96f10cce2f2c1e75624138beb67d678
havoc [Fri, 19 Feb 2010 14:45:49 +0000 (14:45 +0000)]
fix two compile errors in cg shader
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9987
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1190e59ac9da31cd10085b172858b91112cb5695
havoc [Thu, 18 Feb 2010 12:11:48 +0000 (12:11 +0000)]
don't error out if external lightmap sizes mismatch, just print a
warning and ignore the mismatching one and any later ones
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9986
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a62eaee164fc07bb7829eaf44d1ea064a72e6ec
divverent [Thu, 18 Feb 2010 11:39:49 +0000 (11:39 +0000)]
new argument "force" to gl_texturemode for more augenkrebs fun (and e.g. debugging lightmaps)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9985
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ccc452866edbf84f189214c15bb4ef373d7d8385
havoc [Thu, 18 Feb 2010 06:25:26 +0000 (06:25 +0000)]
moved BIH_LEAF from bih_nodetype_t to bih_leaftype_t
renamed BIH_LEAF to BIH_BRUSH
renamed BIH_LEAF + 1 to BIH_COLLISIONTRIANGLE
renamed BIH_LEAF + 2 to BIH_RENDERTRIANGLE
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9984
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c47771198ec4b5144616f28a9774038a0767b3da
havoc [Thu, 18 Feb 2010 06:23:28 +0000 (06:23 +0000)]
move RESTRICT keyword define to qtypes.h and add it to all the
AnimateVertices functions to hush a warning in MSVC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9983
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3d71dc6b3c36b9ae98ecdcb30edd8c8a7515e553
havoc [Thu, 18 Feb 2010 06:10:59 +0000 (06:10 +0000)]
added RF_FULLBRIGHT and RF_NOSHADOW renderflags for CSQC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9982
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
72943b86b04da4f0ee7b4074287ec3743b8cd077
havoc [Thu, 18 Feb 2010 06:10:03 +0000 (06:10 +0000)]
fix a couple enum mixed with int warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9981
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d7ed34c18e0b6c5139faf743b613a473d419ea27
havoc [Thu, 18 Feb 2010 06:09:40 +0000 (06:09 +0000)]
add bih.[ch] to MSVC projects
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9980
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
001e49ea761abfc2982a5999e102b6bfe83a4e50
havoc [Thu, 18 Feb 2010 04:01:53 +0000 (04:01 +0000)]
set supercontents and surfaceflags on models not using shaders
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9978
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
caf55d8aa7707c0e3346fa904c9ebf179b2645c2