Commit graph

318 commits

Author SHA1 Message Date
terminx
0b1f6f91a9 grp shit
git-svn-id: https://svn.eduke32.com/eduke32@552 1a8010ca-5511-0410-912e-c29ae57300e0
2007-07-04 09:15:08 +00:00
terminx
35afa5ff53 git-svn-id: https://svn.eduke32.com/eduke32@546 1a8010ca-5511-0410-912e-c29ae57300e0 2007-05-17 19:31:14 +00:00
terminx
62d44f9722 git-svn-id: https://svn.eduke32.com/eduke32@545 1a8010ca-5511-0410-912e-c29ae57300e0 2007-05-01 04:37:08 +00:00
terminx
4ec4aac70f Speed up HRP loading
git-svn-id: https://svn.eduke32.com/eduke32@543 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-30 19:41:19 +00:00
terminx
e2fe946d35 Crash fix
git-svn-id: https://svn.eduke32.com/eduke32@542 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-28 21:24:36 +00:00
terminx
fc287ec735 Prototype for user-defined tile groups
git-svn-id: https://svn.eduke32.com/eduke32@536 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-21 20:25:07 +00:00
terminx
62ae233489 Newer tile selector from Mapfun and some other stuff
git-svn-id: https://svn.eduke32.com/eduke32@534 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-17 05:54:12 +00:00
terminx
a5388fc0a4 git-svn-id: https://svn.eduke32.com/eduke32@532 1a8010ca-5511-0410-912e-c29ae57300e0 2007-04-15 20:04:52 +00:00
terminx
b54b8e1e6b git-svn-id: https://svn.eduke32.com/eduke32@529 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-24 23:17:56 +00:00
terminx
4785f64476 git-svn-id: https://svn.eduke32.com/eduke32@528 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-22 20:58:13 +00:00
Plagman
004e4da3de Game angle interpolation (cl_angleinterpolation) and engine model animation smoothing (r_animsmoothing).
git-svn-id: https://svn.eduke32.com/eduke32@525 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-22 18:28:41 +00:00
terminx
2bf47cbbed Extra grp file autoloading for grp files included via the command line or the def files
git-svn-id: https://svn.eduke32.com/eduke32@524 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-21 20:37:24 +00:00
terminx
4b4d37cf3f git-svn-id: https://svn.eduke32.com/eduke32@523 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-13 18:37:46 +00:00
terminx
7c7b8c2869 Whitespace
git-svn-id: https://svn.eduke32.com/eduke32@522 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-11 00:47:32 +00:00
terminx
38810c6561 Showview command updates and a couple of other things
git-svn-id: https://svn.eduke32.com/eduke32@521 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-11 00:20:32 +00:00
terminx
cb77e41236 git-svn-id: https://svn.eduke32.com/eduke32@520 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-08 21:07:10 +00:00
terminx
070c38a85e git-svn-id: https://svn.eduke32.com/eduke32@515 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-07 20:18:48 +00:00
terminx
67efe33c18 Small things
git-svn-id: https://svn.eduke32.com/eduke32@514 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-04 19:52:57 +00:00
terminx
8e86c02364 git-svn-id: https://svn.eduke32.com/eduke32@511 1a8010ca-5511-0410-912e-c29ae57300e0 2007-03-01 00:50:59 +00:00
terminx
33985f1650 This adds a menu option for network packet rate, and more conversion of passing things as char or short to passing things as int
git-svn-id: https://svn.eduke32.com/eduke32@509 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-28 09:12:41 +00:00
terminx
23dbb55689 Bug fixes
git-svn-id: https://svn.eduke32.com/eduke32@508 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-26 01:46:38 +00:00
terminx
f889e552b2 Support for automatically loading all grp/zip/pk3 files in a directory. Files go into the "autoload" directory if they're to be loaded by all main grp files that are supported, or into autoload/grpname to be loaded only if a specific grp is used. For example, autoload/duke3d.grp/hrp.zip would only be loaded if duke3d.grp was specified as the main group file (and not nam.grp, et cetera).
git-svn-id: https://svn.eduke32.com/eduke32@507 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-25 21:11:59 +00:00
terminx
0dfc03afa0 Fixes the skybox problem, the problem with the default keyboard configuration, and adds cl_viewbob and cl_weaponsway
git-svn-id: https://svn.eduke32.com/eduke32@506 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-23 22:27:22 +00:00
terminx
eb35e8b927 git-svn-id: https://svn.eduke32.com/eduke32@505 1a8010ca-5511-0410-912e-c29ae57300e0 2007-02-18 22:16:01 +00:00
terminx
7da6eb3f8e This rips all of the camera control shit out of userdefs and re-implements it as a bunch of pointer gamevars. This required adding in support for vars which are pointers to chars and short ints. It appears to work properly, without overwriting anything that happens to be adjacent (in memory) to the values being set. We'll see.
git-svn-id: https://svn.eduke32.com/eduke32@502 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 06:59:05 +00:00
terminx
d3af85c064 Some crap I didn't commit before
git-svn-id: https://svn.eduke32.com/eduke32@500 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 00:11:25 +00:00
terminx
c4ffc08584 This adds a menu option to reset the keys to the default configuration
git-svn-id: https://svn.eduke32.com/eduke32@495 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-13 09:50:58 +00:00
terminx
4dcb01ae6e This removes the bullet spread from the pistol if the player is aiming directly at something aim() would target, allowing the special enhanced auto-aim for the pistol to be mimicked when auto-aim is disabled.
git-svn-id: https://svn.eduke32.com/eduke32@493 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-13 02:56:10 +00:00
terminx
32470fe65c Added EVENT_DISPLAYSTATUSBAR and moved the "detail" option out of game options and into the video setup menu (but only while classic mode is enabled).
git-svn-id: https://svn.eduke32.com/eduke32@492 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-13 02:22:17 +00:00
terminx
ef8f308c9b Status bar stuff... this adds new hotkeys for scaling the status bar (hold shift while pressing the shrink or enlarge screen buttons) and also adds support for a left-justified version of the full status bar
git-svn-id: https://svn.eduke32.com/eduke32@491 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-13 01:28:50 +00:00
terminx
7e79039197 Clean up the new camera control stuff a little bit
git-svn-id: https://svn.eduke32.com/eduke32@489 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-12 21:17:52 +00:00
terminx
abcce7e337 Camera control
git-svn-id: https://svn.eduke32.com/eduke32@487 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-12 07:58:03 +00:00
terminx
465b5041f3 This fixes a defect which could cause the game to crash when a duke3d_w32 network configuration file without explicitly defined ports is used.
git-svn-id: https://svn.eduke32.com/eduke32@486 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-11 22:05:50 +00:00
terminx
e96c05767e This changes the pistol's autoaim back to how it was in the DOS version of Duke3D. I suspect this behavior was changed during NAM or WW2GI development and just never noticed until now.
git-svn-id: https://svn.eduke32.com/eduke32@485 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-11 00:49:03 +00:00
terminx
fd4dfeb6a5 Update the headers of all source files, add CON_SHOWVIEW based on a patch from CONAN, other minor fixes
git-svn-id: https://svn.eduke32.com/eduke32@484 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-08 04:19:39 +00:00
terminx
90c4f271b2 git-svn-id: https://svn.eduke32.com/eduke32@482 1a8010ca-5511-0410-912e-c29ae57300e0 2007-02-05 01:33:08 +00:00
terminx
72ec04ff88 Allow use of grp files which exist outside of the game directory
git-svn-id: https://svn.eduke32.com/eduke32@481 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-30 09:03:51 +00:00
terminx
0a1afbd3f3 Minor fixes
git-svn-id: https://svn.eduke32.com/eduke32@480 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-30 02:04:14 +00:00
terminx
50d1a03dbc Move screenshot code to getpackets() to allow screenshots in the menu and in cutscenes and add some snd_ cvars and a restartsound console command.
git-svn-id: https://svn.eduke32.com/eduke32@472 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-26 05:16:10 +00:00
terminx
50559c7a32 Re-done player setup menu, support for 4 teams in multiplayer, and separate menu options for weapon switch on pickup and weapon switch when empty. The string with __DATE__ and __TIME__ in it (which is used in the first line of the log file) was moved to global.c so that we're no longer forcing game.c to be recompiled every time something else is changed.
git-svn-id: https://svn.eduke32.com/eduke32@471 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-26 00:28:44 +00:00
terminx
f628faefd8 Misc. fixes
git-svn-id: https://svn.eduke32.com/eduke32@469 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-24 03:42:54 +00:00
terminx
23a468d956 git-svn-id: https://svn.eduke32.com/eduke32@468 1a8010ca-5511-0410-912e-c29ae57300e0 2007-01-22 05:00:57 +00:00
terminx
76c2340c83 Support for -game_dir similar to Duke3d_w32
git-svn-id: https://svn.eduke32.com/eduke32@465 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-22 02:35:54 +00:00
terminx
a94063e0be Dynamically loaded GLU
git-svn-id: https://svn.eduke32.com/eduke32@462 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-16 03:19:04 +00:00
terminx
7b0104e9a1 JFAud
git-svn-id: https://svn.eduke32.com/eduke32@452 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-12 22:42:19 +00:00
terminx
fc4bc3ef70 CON command for earthquakes
git-svn-id: https://svn.eduke32.com/eduke32@444 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-05 22:30:35 +00:00
terminx
cba58265b9 Control over the cache1d size...
git-svn-id: https://svn.eduke32.com/eduke32@442 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-02 02:27:57 +00:00
terminx
d2566913bb git-svn-id: https://svn.eduke32.com/eduke32@437 1a8010ca-5511-0410-912e-c29ae57300e0 2006-12-23 02:38:47 +00:00
terminx
8d6eef5b0f More tiny optimizations I guess
git-svn-id: https://svn.eduke32.com/eduke32@433 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-21 09:33:26 +00:00
terminx
bc4139356a Prefer passing things between functions as int rather than short or char to avoid the overhead of converting back and forth between formats
git-svn-id: https://svn.eduke32.com/eduke32@432 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-20 03:27:25 +00:00
terminx
d93dde5a59 Optimize some of the frequently used CON commands that have nasty overhead
git-svn-id: https://svn.eduke32.com/eduke32@428 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-18 08:37:12 +00:00
terminx
b04bfe58fb Removed orderweaponnum()
git-svn-id: https://svn.eduke32.com/eduke32@425 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-18 04:16:41 +00:00
terminx
aaa84f3574 Stuff, and things.
git-svn-id: https://svn.eduke32.com/eduke32@423 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-17 21:20:35 +00:00
terminx
242eb24e3e This should allow map progression via nukebutton to work up to the 32 level limit, for all episodes.
git-svn-id: https://svn.eduke32.com/eduke32@422 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-17 03:21:55 +00:00
terminx
a236be837c git-svn-id: https://svn.eduke32.com/eduke32@421 1a8010ca-5511-0410-912e-c29ae57300e0 2006-12-17 01:08:39 +00:00
terminx
ccb6ff7141 Minor fixes and a couple of improvements to the fake AI players
git-svn-id: https://svn.eduke32.com/eduke32@419 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-15 01:09:25 +00:00
terminx
cd4e66b71a Faster movement in Mapster32.
git-svn-id: https://svn.eduke32.com/eduke32@418 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-14 08:50:18 +00:00
terminx
a68248896c I wonder how this feature is going to come back to bite me in the ass later
git-svn-id: https://svn.eduke32.com/eduke32@417 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-14 04:13:19 +00:00
terminx
dc0dea7c09 Update checking for win32...
git-svn-id: https://svn.eduke32.com/eduke32@416 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-14 03:34:55 +00:00
terminx
991d785e73 Add an extra noapply flag to setbrightness() so we can invalidate just the 8 bit textures.
git-svn-id: https://svn.eduke32.com/eduke32@415 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 09:28:37 +00:00
terminx
a35a73796c Function for changing map in multiplayer
git-svn-id: https://svn.eduke32.com/eduke32@414 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 08:46:32 +00:00
terminx
760e784ffc Multiplayer code for "map" and "changelevel"
git-svn-id: https://svn.eduke32.com/eduke32@413 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 08:33:11 +00:00
terminx
35ea2d7ad1 Make sure map filenames always get slashes prepended to them, to make sure getlevelfromfilename() doesn't fail
git-svn-id: https://svn.eduke32.com/eduke32@412 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 07:25:01 +00:00
terminx
998ced5cc4 More menu stuff
git-svn-id: https://svn.eduke32.com/eduke32@410 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 05:59:47 +00:00
terminx
401767810f Allow the startup screens to be skipped via mouse and allow the help and credits screens to be navigated via mouse as well
git-svn-id: https://svn.eduke32.com/eduke32@409 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-12 04:31:51 +00:00
terminx
3509a4dc8c Fixes
git-svn-id: https://svn.eduke32.com/eduke32@404 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-11 21:18:21 +00:00
terminx
3d867963b9 Support for a version string to stick in the lower right hand corner of the OSD
git-svn-id: https://svn.eduke32.com/eduke32@403 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-11 04:38:10 +00:00
terminx
c4147db020 Blah blah blah
git-svn-id: https://svn.eduke32.com/eduke32@400 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 21:53:33 +00:00
terminx
7017166f2d Oops
git-svn-id: https://svn.eduke32.com/eduke32@399 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 19:32:44 +00:00
terminx
169e0c824b Give most of the gamevar stuff its own object
git-svn-id: https://svn.eduke32.com/eduke32@398 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 06:49:01 +00:00
terminx
0bd5f4a9e5 Uhh.. yeah
git-svn-id: https://svn.eduke32.com/eduke32@395 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 03:15:56 +00:00
terminx
d48c66b7ad I guess this is an optimization as well
git-svn-id: https://svn.eduke32.com/eduke32@394 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 01:52:35 +00:00
terminx
15ee3431f9 Check to see if the user map filename matches a defined level name and warp to that level instead of opening it as a user map
git-svn-id: https://svn.eduke32.com/eduke32@392 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-09 23:41:43 +00:00
terminx
e11f4c9afb Better alt-tab support for fullscreen OpenGL on win32
git-svn-id: https://svn.eduke32.com/eduke32@391 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-08 16:45:12 +00:00
terminx
c45445f8aa Null pointer checks for music filenames
git-svn-id: https://svn.eduke32.com/eduke32@389 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-06 23:14:49 +00:00
terminx
bee93c60b7 git-svn-id: https://svn.eduke32.com/eduke32@388 1a8010ca-5511-0410-912e-c29ae57300e0 2006-12-06 06:27:07 +00:00
terminx
ccb93c19d8 Palette stuff... hijack hictinting[MAXPALOOKUPS-1] for use as a tint control on all hightile assets. This way, NVG and underwater tinting in Polymost doesn't interfere with the ps[].pals tinting that palfrom sets in the CONs.
git-svn-id: https://svn.eduke32.com/eduke32@384 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-05 20:39:29 +00:00
terminx
9fc9365e2f Allow access to map12-map32 in multiplayer, and skip the ones that aren't defined
git-svn-id: https://svn.eduke32.com/eduke32@383 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-05 00:16:33 +00:00
terminx
57042cd9a7 This raises the max number of levels per episode to 32 and alters the game to use dynamically allocated memory for level and music names and filenames. No null pointer checks yet.
git-svn-id: https://svn.eduke32.com/eduke32@381 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-04 22:05:30 +00:00
terminx
3a811040af La la la
git-svn-id: https://svn.eduke32.com/eduke32@380 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-04 04:12:14 +00:00
terminx
42fe36d067 This makes -map bypass the menu in multiplayer
git-svn-id: https://svn.eduke32.com/eduke32@378 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-04 02:10:18 +00:00
terminx
fb06419c82 updatesectorz() -> updatesector()
I now have a clue about updatesectorz() breaking things. :o


git-svn-id: https://svn.eduke32.com/eduke32@376 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-02 06:00:49 +00:00
terminx
36f69beeb6 This should fix a bug with ifgotweaponce where the game had a rare chance of crashing and burning in cooperative
git-svn-id: https://svn.eduke32.com/eduke32@375 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-01 22:34:32 +00:00
terminx
0d22a2a208 Save the GRP file selected in the startup window to the cfg
git-svn-id: https://svn.eduke32.com/eduke32@374 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-01 04:22:16 +00:00
terminx
e35a1bdc33 I guess these checks are necessary, because if we don't have them, rmnet segfaults when it tries to strtok things that don't exist.
git-svn-id: https://svn.eduke32.com/eduke32@373 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-01 01:20:59 +00:00
terminx
f71b2cd2d9 updatesector() -> updatesectorz()
I have no clue if this breaks anything.


git-svn-id: https://svn.eduke32.com/eduke32@372 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-30 23:53:44 +00:00
terminx
5dda5b1660 Rename some functions and separate the player's weapon choice back out into its own packet, because we don't need to send it with player updates from the menu.
git-svn-id: https://svn.eduke32.com/eduke32@371 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-30 23:37:47 +00:00
terminx
da317ac063 One less hack :o
git-svn-id: https://svn.eduke32.com/eduke32@370 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-30 09:22:54 +00:00
terminx
4f17d1299b Lag meter and a couple of MP fixes
git-svn-id: https://svn.eduke32.com/eduke32@368 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-30 04:36:20 +00:00
terminx
79f6c600d5 Multiplayer fixes. This solves the crash on map change issue.
git-svn-id: https://svn.eduke32.com/eduke32@367 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-30 02:09:51 +00:00
terminx
270d573af3 Hmm..
git-svn-id: https://svn.eduke32.com/eduke32@365 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-29 10:30:25 +00:00
terminx
44fcea85a8 Makefile switch for which networking code to use
git-svn-id: https://svn.eduke32.com/eduke32@364 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-28 22:53:11 +00:00
terminx
8727166e24 I wish I knew why this doesn't work
git-svn-id: https://svn.eduke32.com/eduke32@363 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-28 16:23:37 +00:00
terminx
d7d9e82be0 Duke3d_w32 netcode... this compiles but doesn't work yet
git-svn-id: https://svn.eduke32.com/eduke32@362 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-28 04:16:20 +00:00
terminx
5ebab8df83 git-svn-id: https://svn.eduke32.com/eduke32@361 1a8010ca-5511-0410-912e-c29ae57300e0 2006-11-26 21:15:20 +00:00
terminx
8efa4670bb Support for using a different cfg file via command line
git-svn-id: https://svn.eduke32.com/eduke32@360 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-24 04:25:13 +00:00
terminx
cac0d84384 Fixes
git-svn-id: https://svn.eduke32.com/eduke32@359 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-22 01:25:35 +00:00
terminx
b6f6873603 git-svn-id: https://svn.eduke32.com/eduke32@354 1a8010ca-5511-0410-912e-c29ae57300e0 2006-11-20 04:55:37 +00:00
terminx
715bc289e8 Fix "array subscript has type 'char'" warnings
git-svn-id: https://svn.eduke32.com/eduke32@352 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-19 08:24:46 +00:00
terminx
65dc97d55b More warning fixes
git-svn-id: https://svn.eduke32.com/eduke32@349 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-19 03:02:36 +00:00