]>
git.xonotic.org Git - xonotic/darkplaces.git/log
divverent [Sun, 2 May 2010 14:09:29 +0000 (14:09 +0000)]
Better following limits for the new code. Added new cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10156
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cc27af0a62aaa14f37203c7863ea80faa8c9b777
divverent [Sun, 2 May 2010 14:09:17 +0000 (14:09 +0000)]
hopefully fix issues with mouse motion (shivering) and warpzones
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10155
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb1cf185b836afce7c31b8e187c90e9d4647ae5d
divverent [Sun, 2 May 2010 14:09:09 +0000 (14:09 +0000)]
Add the highpass cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10154
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b2079b40ba19bfb326909f439ab3bfda14465865
divverent [Sun, 2 May 2010 14:09:01 +0000 (14:09 +0000)]
simplify and clean up the gun model effects code a bit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10153
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e6c3fa55117e7004ef9ada041fd1eed4b08800f
divverent [Sun, 2 May 2010 14:08:57 +0000 (14:08 +0000)]
Very minor renaming
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10152
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a58f7e6b1aa12ea3e8c8663e69d4efd81c7e1046
divverent [Sun, 2 May 2010 14:08:51 +0000 (14:08 +0000)]
Use cl.realframetime properly again
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10151
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
874d8f76ec8f70b02675649ccecf0486d743d17b
divverent [Sun, 2 May 2010 14:08:35 +0000 (14:08 +0000)]
Actually, why not persist gunorg and gunangles and work with them directly, rather than using intermediary vectors and replacing with them?
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10150
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8550293cb14c4078ac42164656b4536a218c03ea
divverent [Sun, 2 May 2010 14:08:30 +0000 (14:08 +0000)]
Minor optimizations
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10149
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
74c715a123e45dd43b6032ae5f9e151985241dd9
divverent [Sun, 2 May 2010 14:08:23 +0000 (14:08 +0000)]
Weapon following: Subtract player velocity from gun origin rather than making the gun follow the player. Reduces a huge code to a few lines and works much better. How could I not realize this until now? :P
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10148
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a8b88dda9e6e91a74a5cd0eabf8e6deb88de9acd
divverent [Sun, 2 May 2010 14:08:01 +0000 (14:08 +0000)]
Use averaging for calculating the leaning speed. Most of the credits go to FruitieX for this code.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a43bd0a32bbf3c2d04555417a7a46a1fcaa2d714
divverent [Sun, 2 May 2010 14:07:45 +0000 (14:07 +0000)]
Make leaning even faster (more discrete). Fix typos from previous commit.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10146
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
086d225b8857e040f4d8d691b8c7029f85025bbb
divverent [Sun, 2 May 2010 14:07:39 +0000 (14:07 +0000)]
Tweak limits, to make this more like in Half-Life 2 :)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10145
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6b919716f3d1141e66610e4e966eeefc33e7c822
divverent [Sun, 2 May 2010 14:07:30 +0000 (14:07 +0000)]
Faster speeds and tighter limits by default
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10144
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f5680929fc0f74c0b26073a8dc238ed7b6815317
divverent [Sun, 2 May 2010 14:07:13 +0000 (14:07 +0000)]
Fix slowmo speed
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10143
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
472d7de72bd767ae53d98682dd78c690aeee3bb1
divverent [Sun, 2 May 2010 14:07:02 +0000 (14:07 +0000)]
Minor comment arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10142
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
42d1b5f714589cdce0fa0195aaf78706b3db7192
divverent [Sun, 2 May 2010 14:06:49 +0000 (14:06 +0000)]
try to fix the gun origin for view bobbing
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10141
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
38454f0f53e0fbe2c1dca6e32426fe360cddc26b
divverent [Sun, 2 May 2010 14:06:38 +0000 (14:06 +0000)]
Revert "More arrangements"
This reverts commit
06694fee2275d36160c2948be3fd1f224842d800 .
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10140
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb124a812a90a43f6984e999244548896c0110b3
divverent [Sun, 2 May 2010 14:06:22 +0000 (14:06 +0000)]
More arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10139
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
93df350f3237f064b8e119af2cb5f02a1f7b63a2
divverent [Sun, 2 May 2010 14:06:14 +0000 (14:06 +0000)]
Fix some comments
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10138
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b5605388681066494f754a3202bdf3a904d8e266
divverent [Sun, 2 May 2010 14:06:08 +0000 (14:06 +0000)]
fix a typo in the last commit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10137
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b41be46ff68f49e9d832fd081ad040c5be6cf33e
divverent [Sun, 2 May 2010 14:06:02 +0000 (14:06 +0000)]
move the new globals into the cl struct
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10136
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2e08d0c41d863477118bb838762afd6aa715bb4b
divverent [Sun, 2 May 2010 14:05:53 +0000 (14:05 +0000)]
some fixes to Taoki's code regarding axis-independence
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10135
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a0017eda3f6ec89608af44b0c1d3255befc354d3
divverent [Sun, 2 May 2010 14:05:43 +0000 (14:05 +0000)]
Final checking and cleanup on my end. Imo this should be ready for testing.
I'm not very good with C and this is my first code for Darkplaces. Therefore my coding may not be that great, so if anyone with more experience could check and optimize this I would be grateful. Please message me on IRC for anything regarding this patch (Taoki).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10134
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8fa6f5aec617b5c1e13ad4de2ffa4a412f3a6e8
divverent [Sun, 2 May 2010 14:05:33 +0000 (14:05 +0000)]
Cvars for part 2. Added safety checks and fixed gunmodel bobbing.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10133
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
625c75ef5d167e769b8b65c8d47238c4b0710872
divverent [Sun, 2 May 2010 14:05:27 +0000 (14:05 +0000)]
Limits for part 2.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10132
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b801f2e6336a273e2fede59039bc393185a6f061
divverent [Sun, 2 May 2010 14:05:16 +0000 (14:05 +0000)]
Part 2 of the viewmodel effects. Gunmodel now "follows" the player, causing it to also push back when you're walking forward and get pulled when you're walking back. To be limited and cvared like the first part.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10131
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7ab8ad15b3891b903f5d6374662bacb7d9db1f65
divverent [Sun, 2 May 2010 14:04:58 +0000 (14:04 +0000)]
Add cl.movevars_timescale into the mix so this works correctly with slowmo. Previous commit stays (if the leaning speed is too high, slowmo is too fast and framerate is too low, the effect is temporarily disabled).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10130
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2572a44e5cc8874ea2e806fd9627959b257dd63e
divverent [Sun, 2 May 2010 14:04:50 +0000 (14:04 +0000)]
Disable when cl.realframetime * speed_cvar go over 1, otherwise angles go crazy and the gun spins at very low FPS. By default this only affects very low framerates, unless setting the speed to high values. Can't think of a better way to avoid the braking angles, but imo this is alright.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10129
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
284f629a0f79a6107caa0c821a314609565b0f64
divverent [Sun, 2 May 2010 14:04:40 +0000 (14:04 +0000)]
Base animation on cl.frametime
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10128
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
89869addee43f275947a8d35aa74f368d50c0dbe
divverent [Sun, 2 May 2010 14:04:31 +0000 (14:04 +0000)]
TODO 3 done. Cvared everything and added better defaults. Still not ready yet.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10127
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6186e06f77921ce0793387c7e694a04b6c99f0c7
divverent [Sun, 2 May 2010 14:04:22 +0000 (14:04 +0000)]
TODO 2 done. View model rotation is now limited. Will do the cvars tomorrow.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10126
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9967420c64a7fd3e420ac417f310cbe189c00738
divverent [Sun, 2 May 2010 14:04:15 +0000 (14:04 +0000)]
Remove reference comment
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10125
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7d8848b724442daa017654971d15f3c40d1d95f6
divverent [Sun, 2 May 2010 14:03:49 +0000 (14:03 +0000)]
TODO 1 done. Gun no longer spins when when passing the 0 <-> 360 border (I miss such obvious maths :P)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10124
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7561b9409abbb9d02068d5ebf8d4a802eea8ef4e
divverent [Sun, 2 May 2010 14:03:31 +0000 (14:03 +0000)]
Gun model leaning effect when looking around (eg. the faster you look up the more your weapon model lowers itself). Things that need to be done before this is ready:
TODO 1: Fix bug where model does a 360* turn when YAW jumps around the 0 - 360 rotation border.
TODO 2: Implement limits (weapon model must not lean past a certain limit)
TODO 3: Cvar everything once the first TODOs are ready.
Sister project (can be separate and done some other time): Push / pull the weapon model based on the direction you are running in.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10123
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b47413e8cd93060c1a18827c08358e46ad9e9ec4
divverent [Sun, 2 May 2010 12:34:15 +0000 (12:34 +0000)]
use 1 + uservec2.x
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10122
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b24fcce32f46a4ee7608072b733f1ea0a5447ecf
divverent [Sun, 2 May 2010 12:34:12 +0000 (12:34 +0000)]
this supposedly is faster on older cards (or with badly optimizing drivers)
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10121
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
52a9f0f4041932c38ef07c932aef189957f4164c
divverent [Sun, 2 May 2010 12:34:08 +0000 (12:34 +0000)]
removing the comments
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10120
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
638e1edfb5c649a3c64e0e1e053763d3b60acdc4
divverent [Sun, 2 May 2010 12:34:05 +0000 (12:34 +0000)]
using float for sobel value
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10119
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0844b647731820ea65b27974e615f9cc3c6bed1a
divverent [Sun, 2 May 2010 12:34:01 +0000 (12:34 +0000)]
get rid of a warning in the shader
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10118
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a6064c322ead85b1c7970781a2d045223583781b
divverent [Sun, 2 May 2010 12:33:58 +0000 (12:33 +0000)]
uservec2.x is now the scene, .y the sobel strength, .z the threshold for sobel
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10117
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7ab94ccd8a97f2443c0fcd77053c230fe3591318
divverent [Sun, 2 May 2010 12:33:54 +0000 (12:33 +0000)]
uservec2 now combines the possibly-blurred scene and the sobel output
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10116
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5cb8042fac7c4f77d63b50646fb2236cf95432d3
divverent [Sun, 2 May 2010 12:33:51 +0000 (12:33 +0000)]
first draft of sobel operator, use r_glsl_postprocess_uservec1 with an x value > 100
From: Wolfgang (Blub) Bumiller <blub@speed.at>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10115
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3b5d7c98e27e8bcbd432a045d2632559badeb21b
divverent [Sun, 2 May 2010 12:32:18 +0000 (12:32 +0000)]
unset command
From: Blub <blub@donotreply>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10114
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4dd30523a9fba5bb7bcc6f490250e49647d480a9
divverent [Sun, 2 May 2010 12:22:31 +0000 (12:22 +0000)]
DP_SV_DISCARDABLEDEMO
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10113
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b44cd3b1de14122e02d8be341ae81bf827d3dbd0
divverent [Sun, 2 May 2010 12:16:28 +0000 (12:16 +0000)]
Add QC/cfg facilities to control deletion of automatically recorded demos
This patch adds two new cvars, cl_autodemo_delete and
sv_autodemo_perclient_discardable, as well as an entity field for use
by game code, .float discardabledemo. See the cvar descriptions for
more details.
From: Jānis Rūcis <parasti@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10112
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
64cdb85e04fe54b7614860bd27f7bbd53bdcaedb
divverent [Sat, 1 May 2010 17:22:09 +0000 (17:22 +0000)]
same modification to the darkplaces-dedicated project
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10111
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
64ca9e1ee2a283592ae5872e554ebb8575340e88
divverent [Sat, 1 May 2010 17:10:00 +0000 (17:10 +0000)]
updated darkplaces.dev project (new files added)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10110
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d7d6a822e55e945ca62dc9afec3d29e4e471e080
divverent [Sat, 1 May 2010 12:21:29 +0000 (12:21 +0000)]
fix stain alpha
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10108
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1b9bd569d86874ea19375b66dd80ae4b4f34aab1
Rudolf Polzer [Fri, 30 Apr 2010 17:22:38 +0000 (19:22 +0200)]
Fix a slight bug caused by the merging by replaying the cherry-picks correctly
::stable-branch::rebase=
c4dbfc4fbf19b5199c2014eaca78475f8d2afb02
havoc [Thu, 25 Feb 2010 16:09:49 +0000 (16:09 +0000)]
don't bother checking if bsp file has been modified on a level change if
developer is 0
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10001
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db08fdf387c8b8f1bd089893962ce66dd2804200
vortex [Wed, 28 Apr 2010 20:19:55 +0000 (20:19 +0000)]
Two more options for videos - vertical align (if video is scaled) and stipple effect (static one, no annoying scrolling), it looks nice with some low res videos. Do not render 3D view when video is played.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10107
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c4dbfc4fbf19b5199c2014eaca78475f8d2afb02
vortex [Mon, 26 Apr 2010 22:33:36 +0000 (22:33 +0000)]
a bit of loading screen bar customization: new cvars scr_loadingscreen_barcolor, scr_loadingscreen_barheight
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10106
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3adc05093a95f863ba206a76848f81b393d1f4f4
vortex [Mon, 26 Apr 2010 19:29:19 +0000 (19:29 +0000)]
fix a warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10105
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2fb0296199fd9fd94e5cb8437213dfcddca44e4a
divverent [Sun, 25 Apr 2010 18:24:54 +0000 (18:24 +0000)]
in MSYS, the WINDIR env variable is uppercase, so let's change the check to that. In case anyone complains, I'll add the lowercase version too again.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10104
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2a00578211a213f590da8788e8b0e9b6f5a52714
divverent [Sat, 24 Apr 2010 20:42:51 +0000 (20:42 +0000)]
mode "developer -1" that behaves like old "developer 0" (also suppresses logging and buffering the messages)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10103
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
016c63753d2811583fa86cfcee0a58cb7c57392b
vortex [Sat, 24 Apr 2010 18:30:51 +0000 (18:30 +0000)]
fix another bug in subtitles parsing (badly parsed negative length)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10102
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
580fff84c75aab0ce43183763f501ec0d496575b
vortex [Sat, 24 Apr 2010 16:45:22 +0000 (16:45 +0000)]
subtitles: fix a bug with last subtitle now showing sometimes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10101
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
95b4da202fbc2c9963fedf4fa710c098618632d7
vortex [Sat, 24 Apr 2010 15:22:01 +0000 (15:22 +0000)]
simple video subtitles support, defined in external text files, added a couple of cvars controlling subtitles (cl_video_*). Added video scaling (video will not be drawn fullscreen but less size and centered) and brightness cvar. Added videoplaying() builtin for menuvm and csqc. Changed isdemo() function to be shared between menuvm and csqc (since it is same). Subtitles uses NOTIFY font.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10099
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
406539417c894954ef88ecc2fc28c26ad01bbba6
havoc [Sat, 24 Apr 2010 08:36:45 +0000 (08:36 +0000)]
fix VorteX's modification of darkplaces.vcproj that made it build
../omnicide.exe instead of darkplaces.exe as it is supposed to
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10098
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a848f4b5d1b343436ceabb2ae370aa3468c0af93
eihrul [Wed, 21 Apr 2010 08:01:20 +0000 (08:01 +0000)]
fix IQM format to use relative base pose
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10097
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
721d323833d63e5f5a9aae94c1ffcfe835734e7e
havoc [Sun, 18 Apr 2010 06:35:20 +0000 (06:35 +0000)]
allow saving multiplayer games from the menu, rather than refusing
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10096
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
14867933aa8c815af35763030015a74cb494c273
divverent [Sat, 17 Apr 2010 19:08:46 +0000 (19:08 +0000)]
fix CRLF on darkplaces.txt
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10095
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b6ac5b5883aaa7351baf0df53f4c9e5252849adc
divverent [Sat, 17 Apr 2010 19:08:20 +0000 (19:08 +0000)]
add a .gitattributes file to define CRLF rules
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10094
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a613f5e07e3752085b232687d1dda8e8e583aaa0
havoc [Fri, 16 Apr 2010 21:42:15 +0000 (21:42 +0000)]
fix serious bug in DP_SV_CLIENTCAMERA that made it break in multiplayer
added DP_SV_CLIENTCAMERA extension name
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10092
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
870a7694eb666082abbdad5e2c78d19c9b23c691
divverent [Fri, 16 Apr 2010 08:18:27 +0000 (08:18 +0000)]
uri_escape: remove * from the set of allowed chars. It now can be used to escape file names for use by Windows. Note that you still need to add a prefix, as Windows does not like file names starting with a dot.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10091
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
071d138ef3cfa738c02987441aba516c8ff4e5fd
eihrul [Thu, 15 Apr 2010 21:46:01 +0000 (21:46 +0000)]
unused IQM scaling
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10090
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d094f91befde01159f1ea2d55df112e3f0424aa4
vortex [Thu, 15 Apr 2010 11:13:22 +0000 (11:13 +0000)]
S_GetEntChallelPosition -> S_GetEntChannelPosition
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10089
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6565597d1fb3cdf77b34f2497e6a0d54c544a9c5
vortex [Thu, 15 Apr 2010 10:53:00 +0000 (10:53 +0000)]
add stubs for S_SoundLength, S_GetEntChallelPosition, dedicated server should compile now
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10088
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
99c18d06ab7e096eb897b802359c15b08f5abe00
divverent [Thu, 15 Apr 2010 10:09:45 +0000 (10:09 +0000)]
block key events while in the event handler called from loading screens - might fix crashes in some cases
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10087
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4dddc90545f4973249f1e0a0e1c0e81747866799
vortex [Wed, 14 Apr 2010 18:45:19 +0000 (18:45 +0000)]
getsoundtime: cant query CHAN_AUTO, so print warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10084
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
119993d28b9a7f19b22b490a188bef1332035b2a
vortex [Wed, 14 Apr 2010 18:40:16 +0000 (18:40 +0000)]
DP_SND_GETSOUNDTIME extension (query sound progress on entities and length of sound files)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10082
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c614f93073c5e69dc1334fd9004746154c7a06e4
vortex [Wed, 14 Apr 2010 15:04:28 +0000 (15:04 +0000)]
DP_CSQC_SETPAUSE (clientside pause that only works in local games, similar to pause set when console is active or main menu is popped up), does not stop sounds
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10080
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db02af84840247f865209d7d628f2d4a44d01827
vortex [Mon, 12 Apr 2010 16:39:17 +0000 (16:39 +0000)]
beta version of DP_CSQC_QUERYRENDERENTITY, explanation here: http://ftp.razorwind.ru/DP_CSQC_QUERYRENDERENTITY.txt
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10077
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d13ec6a6b1765aaa5e0a454e06ff4c272b7aa84a
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