1
0
Fork 0
forked from fte/fteqw
Commit graph

111 commits

Author SHA1 Message Date
Spoike
6c84350afd Try to fix a few issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4670 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-05-30 03:57:30 +00:00
Spoike
3bd6892353 try to fix q2/q3bsp checkclient bug by rewriting everything to do with pvs!
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4668 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-05-23 02:02:51 +00:00
Spoike
bacf9e90ba try to fix a crash or two.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4664 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-05-19 01:44:05 +00:00
Spoike
dd8628eb2a tweak particle system a little for more compat.
added a couple extra effects to r_particledesc high
try and solve the trailparticles madness once and for all by autodetecting which set of arguments is used.
fix some annoyances with menuqc.
rebuild fs cache when doing vid_restart, to avoid insane reload times.
add profiling support.
qcc: be more permissive with {a,b,} in array definitions.
tweaked logfrag builtin to not loose frags quite so easily. should be more robust now. Whether tools agree or not is a different matter... but there's always the possibility that it'll just work.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4644 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-04-24 01:53:01 +00:00
Spoike
8b9ad6a48e fixed menu bug
added some extra quake particle effects to the 'high' set, including some lights. I wonder how many people will complain.
tried to fix up coronas a bit to make them more robust.
fix stepping issue at high framerates.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4639 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-04-13 04:23:13 +00:00
Spoike
4deebba5ee and fix dedicated servers again...
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4612 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-14 13:19:00 +00:00
Spoike
8f6c1a3e92 fix misc junk that was buggy. hurrah for handy test cases.
q3 shader remapping now a bit more robust.
portals finally work properly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4610 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-14 09:59:32 +00:00
Spoike
38a9770253 add support for symlinks in zips.
try to fix normalmaps on q3bsps. could do with verification, but at least I'm not the only one with a bug if its still buggy.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4578 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-01-13 02:42:25 +00:00
Spoike
fb86222fc7 made max_clients more dynamic on the server to attempt to reduce bss usage. hopefully this will help the webgl port without resulting in extra crashes.
tweaked shadowmaps. now seems faster than stencil shadows. cubemap orientation should now match other engines.
tweaked terrain. rtlights work. added pvs tests for embedded terrain. sections are now saved in chunks instead, which should mean windows doesn't have a panic attack at 16 million files in a single directory. hurrah.
first pass at realigning menu options to cope with variable-width fonts. still need to do pure-text items.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4514 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-10-29 17:38:22 +00:00
Spoike
4a1416a5d2 removed hunk memory (as well as -mem argument).
removed cache memory.
added fallback normalmap texture.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4421 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-14 12:22:51 +00:00
Spoike
8d5b217266 ------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines

removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen. 
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéíóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
Spoike
197f716f75 r_wireframe. requires cheats.
omni shadowmaps should work, but do still have issues.
added colour tints to terrain, and clipped decals.
fixed issue where fixed-function shaders were getting drawn with the glsl rendering functions.
tweeked mvd recording code a little. don't use until next mvd-related commit.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4100 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-08-04 01:35:52 +00:00
Spoike
b0d236c5c0 yet more fixes...
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4075 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-07-15 03:18:34 +00:00
Spoike
8ae45223dc Android: fat presses, vibrator, onscreen keyboard, keep-screen-on, console scaling, touch-based console scrolling, additional bindables.
Some memory leaks fixed.
latency with the nq protocol over loopback is much reduced.
Terrain: now mostly a property of a (q1 for now) bsp map, file format changed, glsl now built in, terrain editor builtin improved/changed, holes supported.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4067 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-07-14 16:25:18 +00:00
Spoike
fe23d72d69 Android tweeks
memory freeing tweeks
batch data rearranged a little (to try to reduce memory).
RBSP/FBSP fixed. lightstyles now supported.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4059 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-07-05 19:42:36 +00:00
Spoike
237dffe4d4 Trying to appease bigfoot.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4055 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-06-01 12:57:01 +00:00
Spoike
4db8b46c4b implement ripplemaps. currently requires explicit mod support to use properly.
fix hexen2 conchars
fix audio sample mixups
fix recent beam-related crashes.
added orthographic bsp culling routines.
fix crash on vid_restart.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4050 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-05-14 01:41:08 +00:00
Spoike
33a540806e Small tweeks, bugfixes, breakages, cleanups...
Added $reflection texture map for (water) shaders. Just renders the screen to an fbo before rendering the surface.
hub/savegame fixes.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4034 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-05-09 15:30:53 +00:00
Spoike
95569fc5dd Trying to fix stuff from last commit.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4002 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-02-27 13:55:23 +00:00
Spoike
4149c85ab6 tweeks and changes for android.
audio mixer revamped to cope with threads. 'cache' memory functions no longer used for audio.
added windows acm code to decode mp3 files.
audio playback rates scale with game speed. snd_playbackrate added to control the rate of new samples.
sv_gamespeed no longer needs a map change.
fixed '=' on german keymaps and in_builtinkeymap 0 (and similar issues). bug: keybind names still use US keymap.
added support for rmqe's 24bit network precision.
fixed byterate reporting to no longer be protocol-dependant (nq rates are no longer wildly inaccurate).
removed waterjumping when already dead.
fixed model matrix for viewmodels (modelview unchanged), thus fixing rtlighting on viewmodels.
Added bspx support for rgblighting, lightingdir, and (preliminary)brushlists.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4001 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-02-27 12:23:15 +00:00
Spoike
9ee7301d32 my attempt at android multitouch (csqc can also distinguish separate mice in windows too).
playing around with fragmentation and mtus. added net_mtu to negotiate some mtu size for smaller (or larger) network messages. setting a custom mtu allows for message fragmentation too.
trying to add a reworked deltaing protocol, including all sorts of fun stuff like bbox sizes, and higher ent limits.
added support for content override entities. set the skin field to some (negative) contents value, and you get movable water with prediction and waterwarp and everything, though you likely want a custom qbsp or a shader to get backface culling.
removed some madness with model skins, fixing some weird q3 bugs.
fixed forced-pause-on-start for q2
fixed q3 server to actually accept client packets again.
fixed strftime builtin

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3979 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-02-12 05:18:31 +00:00
Spoike
fb214142a3 tcpconnect fixes
lots of hexen2 fixes
fixed clipped decals again, still not using any...
fixed zips over 2g
rewrote bloom to use glsl. should be slightly more usable now.
lots more hexen2 fixes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3957 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-01-17 07:57:46 +00:00
Spoike
729d6181c2 Misc bugfixes, including q3bsp-rtlights and bloom. Matrix use clarifications. Working towards skeletal glsl code.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3890 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-07-30 14:14:56 +00:00
Spoike
61e4aa96b3 removed separate trigger/solid links.
some q3 fixes.
q2 will autosave on map changes, like q2 normally does.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3839 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-06-29 18:39:11 +00:00
Lance
0e078381b3 Fixed incorrect pointer types, and some other warning types for GCC and MinGW
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3788 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-05-19 13:34:07 +00:00
TimeServ
85fc11e682 trash assembly, old d3d renderers (d3d7/d3d9/fakegl), projects and makefile broken in this commit
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3742 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-03-03 12:57:34 +00:00
Spoike
4fb854e261 Fix a couple of things I noticed while playing in linux.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3727 fc73d0e0-1445-4013-8a0c-d673dee63da5
2011-01-29 19:53:38 +00:00
Spoike
22bb395305 hexen2 client effects now go via the particle system, if they're supported at all. Added 'h2part' description to provide this.
Fixed svc_setangles and sv_bigcoords.
Model code is now responsible for transforming traces instead of it being generic. This fixes rotating things getting stuck in players in hexen2.
The renderer now generates a list of surfaces to draw. Backend now performs rotations/scaling per entity. This fixes sorting order, at least when not using realtime lights.
Hidden items in the hexen2 inventory that you do not have.
Added colourmapping for hexen2.
Should be easier to click on menu items for hexen2.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3602 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-28 17:14:38 +00:00
Spoike
6455e98327 This should fix the pentacles. Though it might break non-mission-pack monsters/maps.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3595 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-18 21:59:06 +00:00
Spoike
83ec5e427f Things should compile again now.
Reverted clipping change, its not stable enough.
Optimised player prediction/tracing.
Framerates are a little more competitive now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3549 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-13 09:49:38 +00:00
Spoike
e7ec40d0c8 Trying to fix some leaks.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3547 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-12 22:46:37 +00:00
Spoike
1e1084bed7 Changes merged from trunk. Also additional extensive changes. Q3 portals work.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3541 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 02:22:39 +00:00
Spoike
9eabcdcd56 Lots of misc changes in an attempt to reduce ODE jitter, and make it work a little better.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3456 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-15 03:20:17 +00:00
Spoike
66b78c0b11 Work In Progress branch.
In this version: replacement GL backend. Replacement D3D backend sharing code with GL. Lots of code reorganisation.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3401 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-04 21:16:50 +00:00
Spoike
546734610c Attempting to fix what I broke.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3399 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-10-06 08:13:07 +00:00
Spoike
fb190d430c Improved the clipped decal algorithm. Less fragments now. Also added support for q3bsp clipped decals.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3388 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-10-06 00:33:54 +00:00
Spoike
9ad2588aed Might as well optimise it while its still present.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3275 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-14 15:13:12 +00:00
Spoike
b5ac90d523 More stuff broken.
Added control over texture coords on particles. Switched them to batch based on common render state. Less state changes there now.
Inverted sorting, to aid depth culling.
fullbrights use vbos too now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3261 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-11 20:56:09 +00:00
Spoike
06b20185b5 cmd efpslist now shows incoming/outgoing packet rates per client, too (expressed in bytes per second - same as rates).
Semi-colon can now be bound properly in the menus.
Fixed a bug with one of my more recent commits.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3229 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-23 21:49:44 +00:00
Spoike
f2cce499f6 Multiple minor cleanups. Chunks of dead code removed.
Added com_parseutf8.
Z_EXT_VWEAP is supposedly supported serverside, but not clientside. It is not advertised, and not used, yet.
Fixed csqc mouse issues in linux, supposedly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3226 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-21 17:45:33 +00:00
Spoike
b763b5594d My monthly commit. I wonder what I broke.
Contains some stuff to get twig working a little better.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3132 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-03-03 01:52:30 +00:00
Spoike
654eabc4c2 Reworked stats for csqc to match LH's suggestion. CSQC can read the 'delta' entities (experimental). Fixed up sv_getrealip, made banning work based on realip too. Added a ban command to easily ban a single client. Renamed some svcs for clarification. Added pvsflags to ssqc for greater control over how ents are sent to csqc. Broke some stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2977 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-25 22:23:43 +00:00
TimeServ
637633af80 vector op cleanups, added pr_droptofloorunits, sets how many units droptofloor QuakeC call will drop, defaults to "" which drops up to 256 units (Quake default)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2304 fc73d0e0-1445-4013-8a0c-d673dee63da5
2006-05-29 04:50:24 +00:00
Spoike
d27d3c5b6d Less warnings (none at the gcc-default warning level)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2046 fc73d0e0-1445-4013-8a0c-d673dee63da5
2006-03-04 20:43:48 +00:00
Spoike
0ad239ca6a Fixed all warnings in MDebug.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1948 fc73d0e0-1445-4013-8a0c-d673dee63da5
2006-02-11 14:51:36 +00:00
Spoike
c609f340f9 Fixed my two bugs with undefined externs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1909 fc73d0e0-1445-4013-8a0c-d673dee63da5
2006-01-29 00:50:13 +00:00
Spoike
fdb5cf3aff Fixed mvd playback as correctly as I can think how.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1902 fc73d0e0-1445-4013-8a0c-d673dee63da5
2006-01-28 19:04:13 +00:00
Spoike
293cacfca4 Fixed an assumption where all lit q1bsp models are cl.worldmodel - we use currentmodel instead.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1491 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-10-16 04:03:13 +00:00
Spoike
347311db8c q3 fixes and misilaneous minor changes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1298 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-09-08 22:52:46 +00:00
Spoike
79022ea924 Don't generate absurd decal fragments.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1279 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-09-07 01:05:27 +00:00
Spoike
1130dea569 Rewrote a few bsp tracing stuff (primarily for heightmap things).
Q3 client and server support is in.
heightmaps are in.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1252 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-08-26 22:56:51 +00:00
Spoike
50a59ff11f rewritten vast chunks of code to support MOVE_HITMODEL as well as clean some of it up a bit. Dedicated server should build now.
A couple of minor bugs fixed too.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1146 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-07-16 00:53:08 +00:00
Spoike
dfd8e1aaed Redesigned sound code for greater modularity.
Added support for dp6/dp7 protocols (ents are still broken).
md3 tags should work properly (still suffer from origin-of-parent interpolation bugs)


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1089 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-06-14 04:52:10 +00:00
Spoike
c2930803d4 hopefully, everything will work that little bit better.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1072 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-06-04 04:20:20 +00:00
Mark Olsen
55fba7d181 Removed unused #include "glquake.h"
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1059 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-05-27 17:59:56 +00:00
Spoike
e348dc30a2 Changed vec4_t down to vec3_t, got the server browser integrated with the menu.dat. csqc is having fun, and nexuiz should work better. Enjoy.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1011 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-05-13 10:42:48 +00:00
Spoike
d7bb31a516 Some changes. QC execution has been tweeked a little. It needs further work still.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@925 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-03-28 00:11:59 +00:00
Spoike
06207797f9 No SV_Error in client only builds please
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@856 fc73d0e0-1445-4013-8a0c-d673dee63da5
2005-01-28 20:19:01 +00:00
Spoike
f1ebcd115c Fixed the unresolved Host_Error external.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@577 fc73d0e0-1445-4013-8a0c-d673dee63da5
2004-12-05 16:47:58 +00:00
Spoike
854f5340c1 server can be configured out, rtlights are a bit more responcible.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@538 fc73d0e0-1445-4013-8a0c-d673dee63da5
2004-11-29 01:21:00 +00:00
Spoike
a67a6355d2 Initial checkin
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4 fc73d0e0-1445-4013-8a0c-d673dee63da5
2004-08-21 01:25:48 +00:00