qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-12 16:14:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
4404 commits 17 branches 20 tags 29 MiB
Commit graph

1142 commits

Author SHA1 Message Date
Bill Currie
5f8118ce1f bah 2002-10-10 03:35:45 +00:00
Bill Currie
5e13394afc rewrite the user matching to assume a clean number refers to uid rathern 
than an leet matched name (Closes: #56)
 2002-10-10 02:17:11 +00:00
Bill Currie
8591a4cddb print the current map time with the map name for "map" 2002-10-09 22:41:07 +00:00
Bill Currie
95d504fade make sv_maxrate changes effective immediately 2002-10-08 04:08:07 +00:00
Bill Currie
80d2f8e27d make it so the demo recorder and normal protocol use common code to 
calculate the client stats
 2002-10-07 22:15:19 +00:00
Bill Currie
cb368e0b3a support writing the extended stats to mvds 2002-10-07 18:58:54 +00:00
Bill Currie
fb8a5afda5 fix a bunch more potential message writes while playing demos 2002-10-07 03:58:08 +00:00
Bill Currie
a0f49816e5 cl_parse.c: 
print the name of the last svc parsed when a badread happens
sv_ents.c:
	allocate enough space for the svc_nails2 nails
 2002-10-06 04:30:50 +00:00
Bill Currie
afad07b8e7 never print the rcon password given as it may be a legitimate password for 
another server (ie, confused person :)
 2002-10-06 03:54:54 +00:00
Bill Currie
9145388750 /never/ write to the message buffers when playing a demo. This avoids the 
"SZ_GetSpace: overflow" messages when playing denis (especially mvd in 1st
person mode).
 2002-10-05 04:52:09 +00:00
Bill Currie
6e015bba1a d'oh, forgot to fix the FIXME :) fixes the seg on demo record start when 
more than 1 player is invovled
 2002-10-04 03:36:51 +00:00
Bill Currie
e698af0208 cut some spam 2002-10-04 03:02:38 +00:00
Bill Currie
212e40b54a mvd recording :) (thanks to qwex 0.165b and highlander) 2002-10-04 02:29:03 +00:00
Bill Currie
30c8646e70 bring in sv_demo.c from qwex. This is only the beginning of the mvd server 
side support.
 2002-10-03 21:00:35 +00:00
Bill Currie
d5117e27ee read excess nails correctly for nail2 2002-10-03 15:10:29 +00:00
Bill Currie
d70caac6d5 whitespace 2002-10-02 22:56:34 +00:00
Bill Currie
2383340031 mvd playback support. seems to work (get some weird entities hanging around 
but I suspect that's the mod used in the demo I was testing with), but
probably needs some cleanup.
 2002-10-02 21:56:45 +00:00
Bill Currie
533a74aa75 don't segfault if the client player temp info key is null (can happen in 
mvd)
 2002-10-02 15:42:39 +00:00
Jeff Teunissen
510ac98c9b PF_Fixme(): better error message. 2002-09-30 16:47:41 +00:00
Ragnvald Maartmann-Moe IV
eb54acf140 Whitespace. 2002-09-28 02:33:39 +00:00
Bill Currie
5397ca66ca bring back the timekick code but make it an alternative (default) to the 
new timecheck code.
 2002-09-27 03:32:20 +00:00
Bill Currie
6bf98db650 kill most of the diffs 2002-09-26 20:58:03 +00:00
Bill Currie
ef49e4cf17 get the skybox serverinfo working 2002-09-18 04:23:58 +00:00
Bill Currie
6fa4205675 tidy up SV_Serverinfo_f, move Cvar_Info from sv_cver.c to sv_ccmds.c and 
make the client no_pogo_stick cvar properly reflect the serverinfo
 2002-09-17 05:11:28 +00:00
Ragnvald Maartmann-Moe IV
5547c56342 Fix fps limiting. 2002-09-14 20:16:15 +00:00
Bill Currie
d9eff16941 allow players to run down ramps normally when no_pogo_stick bit 1 is set 2002-09-14 03:34:33 +00:00
Bill Currie
f7b4dffcc0 get larger player skins working in gl 2002-09-13 05:32:28 +00:00
Bill Currie
e8baa18abd correct a spelling error 2002-09-13 04:31:10 +00:00
Bill Currie
a6318a3baf enhanced no_pogo_stick control 2002-09-13 04:30:18 +00:00
Bill Currie
028202ce3f silence the MAX_PACKET_ENTITIES warning for general use 2002-09-13 00:58:42 +00:00
Ragnvald Maartmann-Moe IV
7bf16df448 More QSG2 work. 2002-09-12 22:09:55 +00:00
Ragnvald Maartmann-Moe IV
17a71cc151 Allow float cl_maxfps settings, clean up code a bit. 2002-09-12 20:49:40 +00:00
Brian Koropoff
7f4cd09e9d Removed the old timecheat protection and added a system that adjusts 
time to what the server thinks is correct when too much inaccuracy
builds up.  This nearly eliminates all speed cheating, both normal and
reverse, except for a brief burst before the protection kicks in.  Might
need cleaning up/tweaking.
 2002-09-12 04:57:40 +00:00
Bill Currie
f0c96dd15c fix a segfault causing silly 2002-09-11 19:26:44 +00:00
Ragnvald Maartmann-Moe IV
0b47b60129 Whitespace. 2002-09-11 18:58:19 +00:00
Bill Currie
9f6f50699d remove vid_basepal, creating vid.palette (current palette) and host_basepal 2002-09-10 03:51:10 +00:00
Ragnvald Maartmann-Moe IV
ceb264ce87 Make nq lightning handling match qw, which also gets some cleanups. 2002-09-09 20:02:52 +00:00
Bill Currie
4001d2574b be sure to use the correct key for allocating effects dlights on players 2002-09-09 16:26:39 +00:00
Bill Currie
82b2f30a20 actually check that the entities match before returning the overridden beam 2002-09-09 15:56:29 +00:00
Bill Currie
cc6c82007c clear validsequence on disconnect so we don't do prediction before we get a 
world model when reconnecting
 2002-09-09 04:20:15 +00:00
Chris Ison
460ce5c0e6 clear cl.worldmodel on disconnect. make sure we don't parse server messages when we are disconnected 2002-09-08 03:21:53 +00:00
Bill Currie
2cd6b68669 fix a redefined #define 2002-09-06 21:59:02 +00:00
Bill Currie
67b01ca5ba cleanup the output of connectionless prints a bit 2002-09-04 19:13:45 +00:00
Bill Currie
5597dc2408 make maplist work over rcon 2002-09-04 18:56:53 +00:00
Bill Currie
4373e4b4de just bail from SV_Map_f if the requested map doesn't exist so play doesn't 
get interupted.
 2002-09-04 18:26:34 +00:00
Bill Currie
7af8e2952e zinx' klik mod makes heavy use of makestatic and that was causing the 
singon buffer to overflow. call SV_FlushSignon before writing the static
entity data.
 2002-09-04 15:12:05 +00:00
Bill Currie
ea7576286a diff-- 2002-08-30 02:18:53 +00:00
Bill Currie
d8c1c735a6 up MAX_PHYSENTS from 32 to (32 + MAX_PACKET_ENTITIES) (ie, 96). While this 
will potentially slow down both client and server, player collision physics
will be more accurate as more entities will be clipped against (and the
client should never complain about physent overflow again).
 2002-08-29 17:32:16 +00:00
Ragnvald Maartmann-Moe IV
92f3e230af Physics bugfix. 2002-08-29 15:42:37 +00:00
Bill Currie
d15177988d we haven't sent heartbeats to the id masters by default for a long time 2002-08-28 21:13:13 +00:00
Bill Currie
3be502630c don't call SV_FinalMessage in SV_Error until networking has been 
initialized so bogus error messages don't get printed
 2002-08-28 21:12:22 +00:00
Bill Currie
a7380fef66 nuke msg_suppress_1 in favor of Sys_DPrintf 2002-08-27 18:05:59 +00:00
Bill Currie
bb1adf63a9 fix the command appended to f_reply message (so-and-so: Average percent 
fullbright for all loaded skins is 4.9%+forward 101) and make the cl_freply
time check work closer to properly
 2002-08-27 16:28:58 +00:00
Bill Currie
a0807c762f fix the handling of escape when in the console before ever connecting 2002-08-27 08:33:21 +00:00
Bill Currie
ec47e08e1c go back to using QFile, quakeio.h and quakefs.h 2002-08-27 07:16:28 +00:00
Brian Koropoff
98fc04e041 Added threads and callbacks to GIB, as well as several QW callbacks dealing 
with player status.
 2002-08-27 04:47:49 +00:00
Brian Koropoff
5595cb848b Blue armor? Guess I shouldn't code too late at night... 2002-08-26 01:10:02 +00:00
Brian Koropoff
876eaa467c Added a few useful builtins and began adding GIB hooks into quakeworld. 
The player global branch variable is now updated with useful information
and the location.get builtin is available to return the current location
of the player based on loc files.  Fixed a bug with zooming out in zoom.gib.
 2002-08-24 05:14:46 +00:00
Ragnvald Maartmann-Moe IV
0085cd698f Lots of whitespace in sv_user.c, plus fix sv_timekick help strings, and up sv_timekick_fuzz from 15 to 30 ms. 2002-08-22 23:04:44 +00:00
Bill Currie
498eac3e90 hmm, missed that one 2002-08-21 03:57:36 +00:00
Bill Currie
5009213564 Move the signal handling code from video/targets/* to sys.c (I'm leaving 
the SDL target files for Despair since he's working on the currently). Also
make progs segfault handling much more robust (and general: sigill etc too:)
 2002-08-20 23:04:57 +00:00
Bill Currie
099e2739b5 various msvc fixes thanks to muzzy (hope he doesn't give up:) 2002-08-20 19:16:11 +00:00
Ragnvald Maartmann-Moe IV
c91f1a2aea Rename Length to VectorLength. 2002-08-20 02:22:40 +00:00
Bill Currie
2b1fd8e8c0 fix the menu keybinding not working bug 2002-08-19 02:48:38 +00:00
Bill Currie
f068b47c0c complain when MAX_PACKET_ENTITIES gets hit to see if this is our problem 2002-08-15 21:11:57 +00:00
Ragnvald Maartmann-Moe IV
c86565307b Use function pointers for DeathmatchOverlay, instead of a ridiculous if/else tangle. Bulkier, but considerably faster. 2002-08-15 09:38:23 +00:00
Bill Currie
0ebaa9834b fix a vim snafu 2002-08-15 03:22:58 +00:00
Bill Currie
bfd02b6412 mess around with the builtin comments 2002-08-14 22:33:10 +00:00
Ragnvald Maartmann-Moe IV
520a3c0a90 Tiny speedup, cleanup. 2002-08-14 10:49:38 +00:00
Bill Currie
ff02dfbbbc make the sdl clients link reliably (some versions of binutils don't cope well 
with no .o files)
 2002-08-12 16:42:26 +00:00
Ragnvald Maartmann-Moe IV
a69b172f6f Cache grappling hook beam model loading, should speed up CTF beam handling. For mods with no beam model, wastes a pointer on a lightning bolt model. Better than crashing... ;) 
Also copy the sound effects LUT for spikes into nq, which I never got around to.
 2002-08-10 02:53:44 +00:00
Bill Currie
b5783866ad fix model_t issues for solaris (now that I know which headers cause the 
problem...:)
 2002-08-09 02:44:23 +00:00
Bill Currie
1354975692 clean out some unneeded includes and fix up model_t for sun (again:P) 2002-08-08 22:24:02 +00:00
Bill Currie
ad03adb133 fix a couple of sillies with sdl 2002-08-08 01:47:32 +00:00
Bill Currie
0963c2476d improved server logging. "logfile" is gone from qw-server to be replaced 
with "sv_logfile" and thus giving nq-server logging as well.
 2002-08-07 18:46:53 +00:00
Bill Currie
64b608b20d put *sys_sdl.c into a lib so it doesn't get compiled more than once and do 
more macroizing
 2002-08-07 18:20:23 +00:00
Brian Koropoff
5c60be3a49 If and while now work, and embedded commands use backticks instead of <> now 
to prevent conflicts with math expressions.  All clients and servers are set
to create buffers with the normal parser.  However, scripts ending in .gib
are now executed in a GIB buffer, and the export command can be used to
make specific GIB functions available to normal command buffers (i.e. the
console).
 2002-08-07 06:17:50 +00:00
Ragnvald Maartmann-Moe IV
e56404d242 Use LUT instead of case for spike sound effects. Faster and more compact, though less legible. 2002-08-06 19:46:13 +00:00
Bill Currie
bd9092a626 per map config files (eg, maps/start.cfg for maps/start.bsp) 2002-08-06 05:45:03 +00:00
Bill Currie
abf1ef37dc convert the flag offset calculation from switch to a lookup table. this 
should be a touch faster avoiding the extra jumps
 2002-08-06 03:52:38 +00:00
Ragnvald Maartmann-Moe IV
f0be492c75 Optimize CTF flag handling. 2002-08-03 17:20:07 +00:00
Brian Koropoff
cf48363c6e More of GIB done: builtins, functions, various cleanups, math, etc. 2002-08-03 06:04:00 +00:00
Brian Koropoff
3c3844d2ac Checked in the beginnings of GIB mark III and modified qw-server to use 
it for its console.
 2002-08-02 04:07:25 +00:00
Bill Currie
5f4c21d796 casting from (signed) char to int does not one whit of good towards avoiding 
the problems associated with signed chars being used to index arrays. must
cast to usigned char so the bit expansion is done on an unsigned value to
avoid the sign extension.
 2002-08-02 03:22:32 +00:00
Bill Currie
a13a2283ae forgot to remove this 2002-08-01 19:49:52 +00:00
Bill Currie
2ce0f2ded2 we now require modern autoconf (2.52+), automake (1.6+) and libtool (1.4+). 
This gives us a bunch more flexibility. plugins no longer have the "lib"
prefix or the version suffix, they're now installed in
$fs_sharepath/QFplugins,, builds should take much less time (in general,
only one of pic or non-pic versions are build), bins and libs can have
individual CFLAGS
 2002-08-01 19:49:10 +00:00
Brian Koropoff
439f9838d3 Whoops, missed some stuff that needed to be in idparse.h 2002-07-31 22:13:15 +00:00
Brian Koropoff
a93b221272 Split off the old console parser into idparse.[ch] and prepared the cbuf 
struct and support functions for GIB mark III.

Oh yeah, I'm back.
 2002-07-31 22:03:53 +00:00
Bill Currie
0bb6769204 fix the non-parsing of quakeforge.conf 2002-07-31 06:06:44 +00:00
Bill Currie
ad6e025a91 take cmd.[ch] back to basics. the gib code is temporarily gone pending 
renovations. cmd_source handling is a little hacky in nq, but it's working.
 2002-07-31 05:19:03 +00:00
Ragnvald Maartmann-Moe IV
c4cb25a83c LOTS of cleanups. Couple little optimizations, plus add cl_showscoresuid 2 to show both pings AND uid. 2002-07-29 17:36:01 +00:00
Ragnvald Maartmann-Moe IV
4d74b80a38 Dead code removal. 2002-07-27 02:50:41 +00:00
Ragnvald Maartmann-Moe IV
227491d929 Remove cl_predict_static, it doesn't need a cvar to control it anymore. Also some minor related cleanups. 2002-07-27 00:44:54 +00:00
Bill Currie
81af9b14e9 move the VID_SetCaption call into CL_SetState where it belongs and fix 
CL_SetState for when connecting to the server (dunno how I mangled that one)
 2002-07-26 20:50:53 +00:00
Ragnvald Maartmann-Moe IV
587de27849 Another step towards QSG2 compliance. 2002-07-25 14:43:36 +00:00
Bill Currie
de22355371 use P_* for params and R_* for return values in builtins code 2002-07-24 21:42:33 +00:00
Bill Currie
dd08f4ff58 fix some operation order issues (might fix the stuck key issue) 2002-07-22 21:47:01 +00:00
Bill Currie
4cc39a07bc hopefully make CL_SetState a little more sensible 2002-07-22 21:25:51 +00:00
Ragnvald Maartmann-Moe IV
0d95bc71ff Fix cl_predict_static default! 2002-07-15 09:29:50 +00:00
Ragnvald Maartmann-Moe IV
6cef69545e Whitespace, prune dead code. 2002-07-07 02:33:00 +00:00
Bill Currie
7e052a5cc7 certain standard user commands (eg, say) can now be overriden by the progs, 
but only once (ie, it's an error for the progs to try to add a command twice)
 2002-07-05 21:15:19 +00:00
Bill Currie
e85b3a3d97 blah, not all automake versions support that 2002-07-05 07:10:39 +00:00
Bill Currie
a918790c2d evil hack, but this gets around the issue of libQFcsqc wanting the renderer 2002-07-05 07:05:52 +00:00
Bill Currie
b4f9652535 give the server progs access to the Cmd api 2002-07-05 06:55:38 +00:00
Bill Currie
cb814165f8 allow progs to register user commands (but not override any of the standard 
ones (yet))
 2002-07-05 06:43:47 +00:00
Bill Currie
73b68e788e close a small security hole where a malicious challenge could potentially 
wreak havoc with info strings.
 2002-07-03 18:29:36 +00:00
Ragnvald Maartmann-Moe IV
64df22aa8c Whitespace, dead code removal, and a couple of tiny cleanups. 2002-07-03 05:40:33 +00:00
Ragnvald Maartmann-Moe IV
c8fcdd5813 Re-enable rendering lights on the player you are viewing from... 2002-07-03 00:37:28 +00:00
Ragnvald Maartmann-Moe IV
1478dcd9c9 Prune dead code. 2002-07-02 21:37:22 +00:00
Ragnvald Maartmann-Moe IV
e1854315ac Clean out DDActive, except from -mgl, which isn't supported ATM. Clean up vid_mgl.c comments and dead code a bit. 2002-07-02 20:34:51 +00:00
Ragnvald Maartmann-Moe IV
5e5fdb7bc2 Kill MSG_WriteChar. 2002-07-02 19:13:53 +00:00
Ragnvald Maartmann-Moe IV
ec5440fccc Whitespace, plus a sprinkling of FIXME markers... 2002-07-02 18:35:36 +00:00
Ragnvald Maartmann-Moe IV
1ca1154964 Speed up client nail packet parsing. 2002-07-02 18:07:51 +00:00
Ragnvald Maartmann-Moe IV
aeab38fe4f Minor cleanups. 2002-06-30 16:19:37 +00:00
Ragnvald Maartmann-Moe IV
d2dd6db51f More nail speedups for qw. 2002-06-29 18:28:32 +00:00
Ragnvald Maartmann-Moe IV
2a3c31edbe More nail fixes, more MSG_* cleanups. 2002-06-29 03:25:25 +00:00
Ragnvald Maartmann-Moe IV
1555324e0d Whitespace, and fixes for SV_EmitNailUpdate. 2002-06-28 02:11:13 +00:00
Ragnvald Maartmann-Moe IV
00d72be48d Whitespace. 2002-06-26 06:33:00 +00:00
Bill Currie
8ddca92dd9 fix a few allskins bugs 2002-06-25 17:07:52 +00:00
Chris Ison
70d8026067 Removing -3dfx's dependancy on clide 2002-06-24 15:56:01 +00:00
Bill Currie
a83ecbd23a make sure we don't get stuck in the console when the server is in 
intermission mode. As far as I can tell, it's pure luck wether the
svc_intermission comes before or after the first pass through the prediction
code, and if it comes before, the prediction code will never run and thus
never realise that it's ok to start rendering, so force the issue if in
intermission mode.
 2002-06-21 05:15:16 +00:00
Bill Currie
e5c470d5e4 realtime should not be affected by pause and also should not be used for 
physics and progs, that's what sv.time is for. Things seem to work nicely,
including map changing, and this /should/ make long uptime servers work so
long as the map gets changes occasionally.
 2002-06-20 16:38:16 +00:00
Bill Currie
7ab3095024 back out Misty's realtime reset work. It did achieve its goal, but winding 
realtime back caused the problems with clients not reconnect on map change
and after my preliminary mucking around with time, I'm convinced there's a
better way.
 2002-06-20 16:15:27 +00:00
Bill Currie
8234988835 yet more cleanup 2002-06-19 23:16:41 +00:00
Bill Currie
a397ef953a Nuke Netchan_AckPacket because it didn't really achieve its goal ('twas a 
server bug anyway), broke qizmo (not that I really care: that's still qizmo's
bug) and (most importantly) broke recording demos across map changes.
(Closes: #14)
 2002-06-19 19:58:36 +00:00
Ragnvald Maartmann-Moe IV
a246015053 Order of operations fix for R_AddEfrags. 2002-06-19 17:32:39 +00:00
Bill Currie
f1ced33e92 a little more cleanup 2002-06-19 17:16:13 +00:00
Ragnvald Maartmann-Moe IV
1ebc5e6fa1 Whitespace. 2002-06-19 17:01:31 +00:00
Bill Currie
5e9baaa7c2 optimise PF_aim for when sv_aim is >= 1 or when the client's noaim is 1 2002-06-19 16:03:01 +00:00
Bill Currie
b4d7f0ec96 move the pps code into it's own function 2002-06-19 05:03:24 +00:00
Bill Currie
85a6c5aa06 remove a redundant call to IN_Move 2002-06-19 04:11:27 +00:00
Bill Currie
5052e3db1f add qsg support for players and actually send EFFECTS2 and FRAME2 for 
packet entities
 2002-06-19 02:55:57 +00:00
Ragnvald Maartmann-Moe IV
d2fadb2978 Temporary workaround for invisible players. 2002-06-18 23:50:53 +00:00
Ragnvald Maartmann-Moe IV
c8bc5dfb4c QSG2 glows almost working. Plus lots of typos killed. 2002-06-18 21:41:24 +00:00
Ragnvald Maartmann-Moe IV
632683e703 Change sv_maxrate 0 to unlimited. Change default to 10000. Remove forced ceiling of 10000. 2002-06-17 16:18:34 +00:00
Ragnvald Maartmann-Moe IV
3900c75cbb Spelling correction in printf. 2002-06-17 05:40:56 +00:00
Bill Currie
9482c151c2 fix the missing view model 2002-06-14 07:55:19 +00:00
Bill Currie
c23a74ecd9 fix the recvfrom address size 2002-06-12 20:26:30 +00:00
Ragnvald Maartmann-Moe IV
2da6bd4907 Rename cl_nopred to cl_predict, cl_nostatpred to cl_predict_static, and disable prediction of static players by default. 2002-06-12 04:45:21 +00:00
Ragnvald Maartmann-Moe IV
bc4c4588cc Minor cleanup. 2002-06-10 23:05:29 +00:00
Ragnvald Maartmann-Moe IV
dd52072c9c Whitespace. 2002-06-10 23:04:34 +00:00
Timothy C. McGrath
ee3f85cf55 Whoops! I got slap happy with ()'s. I'll learn, just let me make more 
bugs ;)

Tim McGrath (Misty)
 2002-06-09 02:44:11 +00:00
Timothy C. McGrath
814b1b5f2b Reworked logging and heartbeats so they use realtime again, instead of 
directly calling sys_doubletime () - managed to remove six calls. Proboably I
should look through the code some more and find more ways to remove more calls
... The server works fine with them on my system as is, but I've gotten the
impression from people in the know that spamming the clock this often is bound
to cause non x86 arches to have problems.

Tim McGrath (Misty)
 2002-06-08 23:29:19 +00:00
Bill Currie
1747c07da6 rename cl_demospeed to demo_speed and add demo_gzip (yeah, compressed demos) 2002-06-08 23:22:26 +00:00
Bill Currie
442ccc3deb no more Sys_* functions defined in nq or qw :) 2002-06-07 15:46:15 +00:00
Bill Currie
ebfdbd9285 the fpu manipulation stuff seems to be better off in the one place that 
actually uses it...
 2002-06-07 15:09:20 +00:00
Bill Currie
4e07810f0d a little cleanup of unneeded lines 2002-06-07 14:44:02 +00:00
Ragnvald Maartmann-Moe IV
ceb73449bb Order of operations cleanup, QSG2 alpha is now colormod[3] in entities. 2002-06-07 11:25:47 +00:00
Ragnvald Maartmann-Moe IV
90f4bf5fa7 Improve dlight flag combination behaviors, plus some more dlight initialization cleanups. 2002-06-07 05:21:53 +00:00
Timothy C. McGrath
b552aceced This should fix bans and heartbeats to work with realtime resets. 
Also of note, I found a line I missed for logging from the last checkin. Doh.

Did not test heartbeats, although the code is so dead simple it ought to
function.

I did not test logging, although the code is rather simple so unless I missed
something, it ought to work this time. ;)

Tim McGrath (Misty)
 2002-06-06 23:38:35 +00:00