]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
divverent [Tue, 11 May 2010 15:47:26 +0000 (15:47 +0000)]
properly strip the / from worldbasename
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10191
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3ca7c53a5e44ff93c8c483581e89e4d3d17cbf80
havoc [Tue, 11 May 2010 09:35:29 +0000 (09:35 +0000)]
append maps/mapname_effectinfo.txt as intended
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10190
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
369153300a877f32ec3c0e4ea112cf2ac5bb20bf
havoc [Tue, 11 May 2010 09:35:09 +0000 (09:35 +0000)]
somehow I missed this edit in the other maps/ checks
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10189
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
064213f25fd7d96bf1608bdbdb1e604ff0efd9f5
divverent [Tue, 11 May 2010 09:11:48 +0000 (09:11 +0000)]
particles: apply rotation so that in the initial display frame of the particle, the start rotation min/max are shown
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10188
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a36ccfb94ba6000ab545b4f1c934fc6a6cc9344
divverent [Mon, 10 May 2010 06:57:49 +0000 (06:57 +0000)]
anoth'error bites the dust
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10187
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9d4a938aa6754bd45770b240fb5820772ecbe8e5
divverent [Mon, 10 May 2010 06:54:13 +0000 (06:54 +0000)]
fix compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10186
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
810077aff6c99517dbd4e112d1f5f184745d1a33
havoc [Mon, 10 May 2010 06:29:56 +0000 (06:29 +0000)]
fixed bug with effectinfo.txt loading so that it now loads the proper
name for the map
added cl.worldmessage, cl.worldname, cl.worldbasename,
cl.worldnamenoextension strings (and sv. versions) as well as cvars
audited all use of these variables in the engine for consistent behavior
basename generation for maps now strips only maps/ prefix (allowing
subdirectory paths to be preserved)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10185
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef9fefb7ab57b0bfe6c159b75ea905db519c7cdd
divverent [Sun, 9 May 2010 13:21:40 +0000 (13:21 +0000)]
stringbuffers: allow "" strings, keep disallowing NULL strings.
Now, bufstr_set'ing an item to string_null will yield string_null on bufstr_get,
and bufstr_set'ing an item to "" will yield "" on bufstr_get.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10184
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9399e2dd28d4db4dde5fc1f03af9cbf2c3aad3ac
divverent [Sun, 9 May 2010 13:08:56 +0000 (13:08 +0000)]
fix segfault on empty slots in a stringbuffer on buf_sort
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10183
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f2f99c891d575a2982667ef1af876a4e72ca02e3
divverent [Sun, 9 May 2010 10:34:50 +0000 (10:34 +0000)]
add a missing include
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10181
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
447d530cf6c1bce63662cd1d0705e9636cb1cdb1
divverent [Sun, 9 May 2010 10:28:26 +0000 (10:28 +0000)]
screenshot: get rid of the 3*w*h+18 TGA buffer; instead however always capture as BGRA from the GPU;
also cvar: r_drawworld (when 0, turns off world drawing), and scr_screenshot_alpha (try to save alpha channel with screenshot).
Together, with this one can make nice alpha transparent screenshots of player models.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10180
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c3edd749ac26c6322eafa8303e592df3c32ffd25
divverent [Sat, 8 May 2010 12:37:48 +0000 (12:37 +0000)]
WritePicture: also support png input images :P
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10176
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e0f3baa334fd30a181cd1eacf39dc26e8841b4e9
divverent [Sat, 8 May 2010 12:37:44 +0000 (12:37 +0000)]
makefile: we need to link to image loading libs in the dedicated server too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10175
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2457d2e4f3e37ddb6665a1368136735dfeb8dafd
divverent [Thu, 6 May 2010 06:45:32 +0000 (06:45 +0000)]
new cvar: mastervolume (controlling both volume and bgmvolume)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10173
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
32510c922fbcaad22056befd2018ea9066c1f138
vortex [Wed, 5 May 2010 18:55:49 +0000 (18:55 +0000)]
add r_editlights_lock command which will lock selection on current selected light (or unlock if already locked)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10172
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
80234e3d370436fe1a9a06ac93404362349f72c8
divverent [Tue, 4 May 2010 11:08:40 +0000 (11:08 +0000)]
demo deleting: switch the meaning of the values 2 and 3 in cl_autodemo_delete, so & 1 would check if the CURRENT demo is to be deleted, and & 2 would check if any future demos are to be deleted
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10171
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
16719bad0f7f92ae5a6def481c99f9be969820ca
vortex [Sun, 2 May 2010 19:43:54 +0000 (19:43 +0000)]
call m_hide() on loadgame/map/changelevel/restart if keydest is menu one (menu or menu_grabbed), since we are going to force it to key_game (which if not forcing to m_hide leads to menu drawn but not reacting to key events).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10167
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d654a049fd0b331a4fd7b65e3c06ae087ebe77e6
divverent [Tue, 4 May 2010 07:31:52 +0000 (07:31 +0000)]
properly declare the aircontrol power cvar
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10170
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a7e53f4afc8ba4aeadd8bdd10a2167aceca77ab
divverent [Tue, 4 May 2010 05:14:45 +0000 (05:14 +0000)]
fix the EndIncreaseEdicts handlers as edicts beyond num_edicts are not initialized yet
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10169
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9edb82a5ebb4cbf2645fa154815df3baa3e59535
divverent [Mon, 3 May 2010 19:43:20 +0000 (19:43 +0000)]
sv_aircontrol_power - customizing the response curve of CPMA style air control
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10168
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4bef4ef2d5b49bb0954597c4bd7f04a952518bea
havoc [Sun, 2 May 2010 17:33:00 +0000 (17:33 +0000)]
added -noconfig commandline option for benchmarking purposes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10165
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dd749c0663a6e55f2513c4f31fc72c8eaead41d3
divverent [Sun, 2 May 2010 14:11:12 +0000 (14:11 +0000)]
for now, turn off gun lean and follow effects by default
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10162
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
15fb2410cafd9ba53b7b227fe8a7ed24c7f04b12
divverent [Sun, 2 May 2010 14:10:40 +0000 (14:10 +0000)]
Revert "gunangles[ROLL] = cl.viewangles[ROLL] rather than 0, because the view may roll sometimes.", as this contains the difference in roll angle, not the roll angle itself
This reverts commit
7ef836e6b9fb5a58e0c10978efbb83a5430b5905 .
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10161
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3b9f3021e40a36ba7dd9512cf19249736d1e3998
divverent [Sun, 2 May 2010 14:10:12 +0000 (14:10 +0000)]
fix most of the guneffect issues with warpzones
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10160
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b7cf56844dcdfc23ce38ba9b3c7b5342b2fd84a3
divverent [Sun, 2 May 2010 14:09:57 +0000 (14:09 +0000)]
gunangles[ROLL] = cl.viewangles[ROLL] rather than 0, because the view may roll sometimes.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10159
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3e2f98b76b520acf73c8b27b108cc973da8c815
divverent [Sun, 2 May 2010 14:09:46 +0000 (14:09 +0000)]
Use only one pair of toggle cvars.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10158
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
088011f0d4bec90d4c73de4d94f22531c4d45206
divverent [Sun, 2 May 2010 14:09:34 +0000 (14:09 +0000)]
attempted fix for teleports
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10157
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
45329bdb67e6117291abc09cbedeb64bf1a06238
divverent [Sun, 2 May 2010 14:09:29 +0000 (14:09 +0000)]
Better following limits for the new code. Added new cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10156
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cc27af0a62aaa14f37203c7863ea80faa8c9b777
divverent [Sun, 2 May 2010 14:09:17 +0000 (14:09 +0000)]
hopefully fix issues with mouse motion (shivering) and warpzones
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10155
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb1cf185b836afce7c31b8e187c90e9d4647ae5d
divverent [Sun, 2 May 2010 14:09:09 +0000 (14:09 +0000)]
Add the highpass cvars to darkplaces.txt
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10154
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b2079b40ba19bfb326909f439ab3bfda14465865
divverent [Sun, 2 May 2010 14:09:01 +0000 (14:09 +0000)]
simplify and clean up the gun model effects code a bit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10153
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e6c3fa55117e7004ef9ada041fd1eed4b08800f
divverent [Sun, 2 May 2010 14:08:57 +0000 (14:08 +0000)]
Very minor renaming
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10152
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a58f7e6b1aa12ea3e8c8663e69d4efd81c7e1046
divverent [Sun, 2 May 2010 14:08:51 +0000 (14:08 +0000)]
Use cl.realframetime properly again
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10151
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
874d8f76ec8f70b02675649ccecf0486d743d17b
divverent [Sun, 2 May 2010 14:08:35 +0000 (14:08 +0000)]
Actually, why not persist gunorg and gunangles and work with them directly, rather than using intermediary vectors and replacing with them?
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10150
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8550293cb14c4078ac42164656b4536a218c03ea
divverent [Sun, 2 May 2010 14:08:30 +0000 (14:08 +0000)]
Minor optimizations
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10149
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
74c715a123e45dd43b6032ae5f9e151985241dd9
divverent [Sun, 2 May 2010 14:08:23 +0000 (14:08 +0000)]
Weapon following: Subtract player velocity from gun origin rather than making the gun follow the player. Reduces a huge code to a few lines and works much better. How could I not realize this until now? :P
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10148
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a8b88dda9e6e91a74a5cd0eabf8e6deb88de9acd
divverent [Sun, 2 May 2010 14:08:01 +0000 (14:08 +0000)]
Use averaging for calculating the leaning speed. Most of the credits go to FruitieX for this code.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a43bd0a32bbf3c2d04555417a7a46a1fcaa2d714
divverent [Sun, 2 May 2010 14:07:45 +0000 (14:07 +0000)]
Make leaning even faster (more discrete). Fix typos from previous commit.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10146
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
086d225b8857e040f4d8d691b8c7029f85025bbb
divverent [Sun, 2 May 2010 14:07:39 +0000 (14:07 +0000)]
Tweak limits, to make this more like in Half-Life 2 :)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10145
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6b919716f3d1141e66610e4e966eeefc33e7c822
divverent [Sun, 2 May 2010 14:07:30 +0000 (14:07 +0000)]
Faster speeds and tighter limits by default
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10144
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f5680929fc0f74c0b26073a8dc238ed7b6815317
divverent [Sun, 2 May 2010 14:07:13 +0000 (14:07 +0000)]
Fix slowmo speed
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10143
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
472d7de72bd767ae53d98682dd78c690aeee3bb1
divverent [Sun, 2 May 2010 14:07:02 +0000 (14:07 +0000)]
Minor comment arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10142
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
42d1b5f714589cdce0fa0195aaf78706b3db7192
divverent [Sun, 2 May 2010 14:06:49 +0000 (14:06 +0000)]
try to fix the gun origin for view bobbing
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10141
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
38454f0f53e0fbe2c1dca6e32426fe360cddc26b
divverent [Sun, 2 May 2010 14:06:38 +0000 (14:06 +0000)]
Revert "More arrangements"
This reverts commit
06694fee2275d36160c2948be3fd1f224842d800 .
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10140
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb124a812a90a43f6984e999244548896c0110b3
divverent [Sun, 2 May 2010 14:06:22 +0000 (14:06 +0000)]
More arrangements
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10139
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
93df350f3237f064b8e119af2cb5f02a1f7b63a2
divverent [Sun, 2 May 2010 14:06:14 +0000 (14:06 +0000)]
Fix some comments
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10138
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b5605388681066494f754a3202bdf3a904d8e266
divverent [Sun, 2 May 2010 14:06:08 +0000 (14:06 +0000)]
fix a typo in the last commit
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10137
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b41be46ff68f49e9d832fd081ad040c5be6cf33e
divverent [Sun, 2 May 2010 14:06:02 +0000 (14:06 +0000)]
move the new globals into the cl struct
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10136
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2e08d0c41d863477118bb838762afd6aa715bb4b
divverent [Sun, 2 May 2010 14:05:53 +0000 (14:05 +0000)]
some fixes to Taoki's code regarding axis-independence
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10135
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a0017eda3f6ec89608af44b0c1d3255befc354d3
divverent [Sun, 2 May 2010 14:05:43 +0000 (14:05 +0000)]
Final checking and cleanup on my end. Imo this should be ready for testing.
I'm not very good with C and this is my first code for Darkplaces. Therefore my coding may not be that great, so if anyone with more experience could check and optimize this I would be grateful. Please message me on IRC for anything regarding this patch (Taoki).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10134
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8fa6f5aec617b5c1e13ad4de2ffa4a412f3a6e8
divverent [Sun, 2 May 2010 14:05:33 +0000 (14:05 +0000)]
Cvars for part 2. Added safety checks and fixed gunmodel bobbing.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10133
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
625c75ef5d167e769b8b65c8d47238c4b0710872
divverent [Sun, 2 May 2010 14:05:27 +0000 (14:05 +0000)]
Limits for part 2.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10132
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b801f2e6336a273e2fede59039bc393185a6f061
divverent [Sun, 2 May 2010 14:05:16 +0000 (14:05 +0000)]
Part 2 of the viewmodel effects. Gunmodel now "follows" the player, causing it to also push back when you're walking forward and get pulled when you're walking back. To be limited and cvared like the first part.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10131
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7ab8ad15b3891b903f5d6374662bacb7d9db1f65
divverent [Sun, 2 May 2010 14:04:58 +0000 (14:04 +0000)]
Add cl.movevars_timescale into the mix so this works correctly with slowmo. Previous commit stays (if the leaning speed is too high, slowmo is too fast and framerate is too low, the effect is temporarily disabled).
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10130
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2572a44e5cc8874ea2e806fd9627959b257dd63e
divverent [Sun, 2 May 2010 14:04:50 +0000 (14:04 +0000)]
Disable when cl.realframetime * speed_cvar go over 1, otherwise angles go crazy and the gun spins at very low FPS. By default this only affects very low framerates, unless setting the speed to high values. Can't think of a better way to avoid the braking angles, but imo this is alright.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10129
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
284f629a0f79a6107caa0c821a314609565b0f64
divverent [Sun, 2 May 2010 14:04:40 +0000 (14:04 +0000)]
Base animation on cl.frametime
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10128
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
89869addee43f275947a8d35aa74f368d50c0dbe
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