zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 04:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
14139 commits 2 branches 1 tag 128 MiB
Commit graph

1116 commits

Author SHA1 Message Date
Christoph Oelckers
af6c6c8ef0 - added the DrawInfo class. 2021-03-18 10:23:53 +01:00
Christoph Oelckers
e9dd1c104b - started adding the draw list code from GZDoom. 2021-03-18 10:19:13 +01:00
Christoph Oelckers
b492cbcebb - ported my old Build-style renderer for Doom from 2008 and the wall renderer from GZDoom to work with Build data. 
It renders walls, but y-panning is still broken.
 2021-03-17 16:54:36 +01:00
Christoph Oelckers
90cb82d244 - disable the player specific volume modifiers if replay gain is enabled. 
These two functions would get into the way of each other otherwise.
 2021-03-14 09:05:28 +01:00
Christoph Oelckers
8ae5d0b30e - backend update from GZDoom. 2021-03-13 01:21:38 +01:00
Christoph Oelckers
ee5950e7ad - backend update from GZDoom. 2021-03-07 13:21:15 +01:00
Christoph Oelckers
9104fba3ec - moved colormap constants to backend. 2021-03-06 23:06:26 +01:00
Christoph Oelckers
5b85105762 - re-added the fix for the inverted card reader in Twin Dragon's Map 10. 
This accidentally got lost when the one-sided key fix was generalized.
 2021-03-06 12:20:03 +01:00
Christoph Oelckers
bbd5c0ac8b - transitioned voxel rendering to use the backend's implementation. 2021-03-02 17:10:34 +01:00
Christoph Oelckers
4b59acd251 - Blood: Check the sound's internal loop flag when playing a sound. 
Fixes #275
 2021-03-02 11:59:20 +01:00
Christoph Oelckers
b9050b1a35 - Blood: properly clip the gauge for throwing dynamite force instead of stretching it. 2021-03-02 03:31:10 +01:00
Christoph Oelckers
2f2d0443f2 - fixed size setup for most menus. 
All of Raze's menus scale to 320x200 and to get proper mouse coordinates the definitions must reflect that as well.
Fixes #271
 2021-03-01 13:08:10 +01:00
Christoph Oelckers
80404558f6 - RR: Fixed the drink and eat meters on the status bar. 
Turned out that the status bar's DrawGraphic cannot handle it with its coordinate hackery, this needs a separate, cleaner interface function that does not mess around with the pivot which needs to be passed unaltered to the backend to properly rotate around it
 2021-02-28 22:34:52 +01:00
Christoph Oelckers
ce87e18f90 - block Escape to toggle the console while AppActive is false. 
This is for testing #174 - this is the only place in the code where the escape key is explicitly checked.
 2021-02-27 13:47:30 +01:00
Christoph Oelckers
ba5ede65b8 - backend update from GZDoom. 2021-02-26 19:06:10 +01:00
Christoph Oelckers
4c915180da - fixed stale pointer access in Unix version of D_AddFile. 
Pointer was assigned a buffer of a local variable that went out of scope before checking its content.
Fixes #268 (hopefully)
 2021-02-26 13:28:02 +01:00
Christoph Oelckers
c96e04e6c9 - backend update from GZDoom. 2021-02-12 14:44:54 +01:00
Christoph Oelckers
ba22df2a2a - removed unused I_GetBuildTimeFrac function. 2021-02-03 12:18:58 +01:00
Christoph Oelckers
8e0c50c22c - fixed: F2DDrawer::AddPoly was missing a texture validation check. 
This caused problems when the automap wanted to render portal planes, which normally use an invalid texture as marker.
Fixes #263
 2021-02-02 23:13:40 +01:00
Christoph Oelckers
e7ab4cd176 - backend update from GZDoom. 2021-01-29 13:20:00 +01:00
Mitchell Richters
ff0be3079e - m_fixed.h: Fix incorrect return type for MulScaleF() originating from 8cf2588bad. 2021-01-29 21:19:15 +11:00
Rachael Alexanderson
3f30d91323 - 21:9 improvements 
- vid_aspect is now set to change to 21:9's ACTUAL aspect - 64:27
- screen elements now scale to 64:27 properly. to restore classic behavior, set cvar `vid_allowtrueultrawide` to false
 2021-01-17 11:45:12 -05:00
Mitchell Richters
5124c0daec - Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h. 2021-01-05 07:31:37 +11:00
Mitchell Richters
f20daa2595 - Replace divscale64() calls with DivScaleU() from common. 2021-01-05 07:31:17 +11:00
Mitchell Richters
8cf2588bad - Replace fmulscale##() calls with MulScaleF() from common. 
* Regex for reference: fmulscale([0-9]+)\((.+)(\)+)
 2021-01-05 07:31:13 +11:00
Mitchell Richters
8f75f06efd - Replace tmulscale##() calls with TMulScale() from common. 2021-01-05 07:31:08 +11:00
Rachael Alexanderson
fc7dada764 - sync from gzdoom 2021-01-02 07:52:59 -05:00
Christoph Oelckers
b73b59cf66 - fixed badly inherited exception subclass. 2020-12-30 09:55:57 +01:00
Rachael Alexanderson
218b0cfb03 - syncing these files over from GZDoom 
- this does not actually yet build for Windows ARM64, but it does put the framework in place to make that possible in the near future
 2020-12-12 09:20:02 -05:00
Christoph Oelckers
dd7d661f9a - explicitly disable mipmapping for indexed textures. 
It looks like this code was not handled properly.
 2020-12-10 20:46:44 +01:00
Christoph Oelckers
94d3d643d7 - fixed: the file system's entry count was not updated before rehashing. 
This broke Blood's RFS parser.
 2020-12-09 18:56:17 +01:00
Christoph Oelckers
5a5f9b8e02 - backend update from GZDoom. 2020-11-23 15:54:06 +01:00
alexey.lysiuk
07eeba88fa - fixed incorrect autosegs section addresses on macOS 
It appeared that getsectbyname() returns address stored in executable header as is, i.e. without adjusting it for ASLR
 2020-11-14 12:48:39 +02:00
Christoph Oelckers
36479b623d - re-fixed crosshair scale to only use one CVAR for everything. 2020-11-13 17:56:55 +01:00
sinisterseed
34dfb6c5fc - fixed crosshair scaling in Exhumed & the other games. 
The problem was that the CVARs operating the scale were different between Exhumed and the other titles, meaning that "crosshairscale" worked in one, but not the others. They have now been split.
Also lowered the default crosshair size as it was too much for Exhumed.
Fixes #180.
 2020-11-13 18:33:18 +02:00
alexey.lysiuk
555007539d - eliminate dependency on linking order for autosegs registration 
This fixes #164
 2020-11-13 09:41:58 +01:00
alexey.lysiuk
6b12514a29 - fixed compilation with MSVC 14.28.29333 from VS2019 16.8.0 
This fixes #175

include\algorithm(7419,1): error C2678: binary '=': no operator found which takes a left-hand operand of type 'const T' (or there is no acceptable conversion) (compiling source file source\common\scripting\jit\jit.cpp)
include\algorithm(7419,17): error C3892: '_First': you cannot assign to a variable that is const (compiling source file source\core\searchpaths.cpp)
 2020-11-12 11:38:53 +02:00
Christoph Oelckers
a92b4943f9 - Duke: use original colors for inventory status display. 
I took one liberty and still use green/yellow/red for the percentage, but this now uses palette translations so that it works better with hires replacements.
 2020-11-11 11:49:05 +01:00
Christoph Oelckers
3558289d70 - give forward declared enum a type. 2020-11-10 21:44:15 +01:00
Christoph Oelckers
96fbfdcf86 - made hires replacements work for untranslated fonts. 2020-11-10 21:34:49 +01:00
Christoph Oelckers
ed599d0f05 - moved the hires texture replacement logic into a backend callback. 
This way it can be handled transparently to the calling code.
Fonts do not work yet, though.
 2020-11-10 16:22:02 +01:00
Christoph Oelckers
40358febc1 - changed render interface to resolve textures to materials in the backend. 
This is needed to have a unified spot where to resolve textures for both 2D and 3D.
 2020-11-10 09:08:48 +01:00
Christoph Oelckers
918425469a - fixed crosshair setup. 
Fixes #168
 2020-11-09 17:20:14 +01:00
Christoph Oelckers
4e6e564e14 - silenced message about missing function prototypes for exports. 
This is necessary to later separate the games' script content from each other because there'd be lots of unprototyped functions otherwise.
 2020-11-05 18:59:21 +01:00
Christoph Oelckers
1a300aa220 - fixed GC crash with new statusbar code. 
It looks GZDoom never run in the case where using Create<> to create an object this left a pointer uninitialized.
To be safe, use Calloc instead of Malloc to get the memory for the new object so that everything is nulled.
 2020-11-03 06:51:42 +01:00
Christoph Oelckers
7a482c6284 - make DHUDFont an object. 2020-10-31 13:20:54 +01:00
Christoph Oelckers
7de6528a1f - the status bars work as objects. 
# Conflicts:
#	source/common/menu/menudef.cpp
 2020-10-31 13:20:54 +01:00
Christoph Oelckers
f341fbc1fb - backend update. 2020-10-28 21:46:43 +01:00
Christoph Oelckers
5abc5c0509 - option menu positioning fix. 2020-10-25 17:11:45 +01:00
Christoph Oelckers
7dda316391 - define console background for Blood. 2020-10-25 15:31:20 +01:00
Christoph Oelckers
94892cc1f8 - set up the main menu background as default console background for Duke and its offspring games. 2020-10-25 15:06:06 +01:00
Christoph Oelckers
74df8f55da - moved c_console.cpp to 'common'. 2020-10-25 13:26:40 +01:00
Christoph Oelckers
8d3585afe1 - console cleanup. 
The bulk of the console is now free of game dependencies.
 2020-10-25 13:14:42 +01:00
Christoph Oelckers
273ad5e133 - backend update 2020-10-25 09:20:26 +01:00
Christoph Oelckers
aeda977bc2 - fixed incomplete font initialization. 2020-10-24 21:02:00 +02:00
Christoph Oelckers
c33525381e - undid the native part of GetFullscreenRect because the functions are not compatible. 2020-10-24 18:13:45 +02:00
Christoph Oelckers
c82d9d2908 - backend update from GZDoom. 2020-10-24 17:30:47 +02:00
Christoph Oelckers
c2828fe2e3 fixed undefined end of list behavior of iterators 
Also fixed a few warnings
 2020-10-18 12:14:05 +02:00
Christoph Oelckers
bc0a55de41 - backend update. 2020-10-17 16:01:31 +02:00
Christoph Oelckers
197a5f642a - properly delete backing images in the texture manager. 
Although the images themselves are automatically taken down, any memory they allocate is not - and some of the special tile classes do need dynamic storage.
 2020-10-15 20:22:41 +02:00
Mitchell Richters
38c0af4d34 - D_AddFile(): Check the existence of the file before enumerating entire directory to find it as input might be coming in correctly. 2020-10-15 06:50:41 +11:00
Mitchell Richters
be42a6e28d - Amend 9d84f92c0e to just do true case-insensitivity. 
* adding /home/mrichters/.config/raze/Blood/sOuNdS.rFf, 1747 lumps
 2020-10-14 20:18:53 +11:00
Mitchell Richters
9d84f92c0e - Amend bce15428d5 to only check case on the filename, not the full path. 
* Still to be tested when I get home, but need it committed to get it off my laptop anyway.
 2020-10-14 18:58:55 +11:00
Christoph Oelckers
25d79285a3 - added the resource file name to the listmaps printout. 2020-10-14 01:13:36 +02:00
Christoph Oelckers
817fa8aba3 - save the entire engine state as JSON. 
The sprite lists may still need optimization. Due to different handling between Blood and the core engine they need to be written out completely which is quite wasteful.
 2020-10-13 20:18:08 +02:00
Christoph Oelckers
bdc1f66131 - missed an include. 2020-10-12 20:30:12 +02:00
Christoph Oelckers
bce15428d5 - for Unix-like systems, check added resources for lower and uppercase variants if the specified one cannot be found. 2020-10-12 20:01:40 +02:00
Christoph Oelckers
8e1c71b867 Merge branch 'InputContinuation' 2020-10-11 15:24:51 +02:00
Christoph Oelckers
47e452f452 - fixed the real issue for the sound problems and reverted the last commit. 
It was far more serious than a botched merge.
 2020-10-11 13:44:23 +02:00
Christoph Oelckers
820b37721b - moved tab completion code into 'common' as well. 2020-10-11 00:08:07 +02:00
Christoph Oelckers
242a70e610 - split the command line buffer off from c_console.cpp and reactivated the check for CONBACK. 2020-10-10 23:16:08 +02:00
Christoph Oelckers
fe2e96d3a6 Merge branch 'master' into InputContinuation 
# Conflicts:
#	source/games/duke/src/duke3d.h
 2020-10-10 21:39:27 +02:00
Christoph Oelckers
a39cf290e3 - Blood: fixed: The player's inventory and some other state were reset for each level, not each new game. 2020-10-10 20:20:12 +02:00
Christoph Oelckers
e95fea1056 - fixed: Toggling palette emulation should reset the texture filter in the samplers. 2020-10-10 18:57:16 +02:00
Christoph Oelckers
16fd505f9a - make sure that sfxinfo_t is always fully initialized by adding initializer values to all fields. 
Let's hope this finally fixes those sound hiccups.
 2020-10-10 09:47:00 +02:00
Christoph Oelckers
b21beb4039 - made the options search work. 
This required changing how the engine credits menu work because it created a circular dependency in its original form.
 2020-10-09 22:33:02 +02:00
Christoph Oelckers
802d295e48 - Shadow Warrior credit screens. 2020-10-08 23:53:15 +02:00
Christoph Oelckers
02507d937d - got the text screens working. Also reformatted RR's credits a bit for a better presentation. 2020-10-08 23:40:17 +02:00
Christoph Oelckers
19c719db4e - image scroller is working again. 2020-10-08 22:53:12 +02:00
Christoph Oelckers
6ba06f5ed0 - ImageScroller WIP commit. 2020-10-08 22:20:41 +02:00
Christoph Oelckers
15eaf86f5a - preparations for the image scroller menu. 2020-10-08 18:02:25 +02:00
Christoph Oelckers
8caaf4fa64 - menu transitions are working again. 2020-10-08 16:33:11 +02:00
Christoph Oelckers
cc7290e313 - work on menu transitions. 2020-10-08 01:00:23 +02:00
Christoph Oelckers
56eae0b42d - got the basics working for Exhumed's main menu. 2020-10-08 00:21:07 +02:00
Christoph Oelckers
2bb38f7d67 - get load and save game menus and related CCMDs working again. 2020-10-07 18:32:57 +02:00
Christoph Oelckers
53c3a6fc9b - silenced some warnings. 2020-10-07 16:02:49 +02:00
Mitchell Richters
90e711464a - clamp(): Remove definition in compat.h and uplift definition in templates.h. 2020-10-07 13:29:00 +11:00
Christoph Oelckers
38ddbfe65f - activated most of the support code for programmatically created menus again. 
Blood's regular menu screens mostly work again
 2020-10-07 01:31:41 +02:00
Christoph Oelckers
5726b693bd - added back the menu transition, although it cannot be used yet, and all game specific menu CCMDs. 2020-10-07 01:12:57 +02:00
Christoph Oelckers
0968a9d97e - renamed the Customizer to 'Delegate' because this works very much like a delegate in Objective-C. 
- route menu sound calls through the delegate to better deal with differences between games.
 2020-10-07 01:00:43 +02:00
Christoph Oelckers
603c3b50ec - reimplemented Blood's menu items. 2020-10-07 00:50:26 +02:00
Christoph Oelckers
d22bdf9dc7 - use an alias for the menu bar texture in Blood. 
Direct tile access has been disabled for now, hopefully this can be buried deep in the engine for all eternity.
 2020-10-06 20:05:51 +02:00
Christoph Oelckers
55e7e34707 - added texture aliases so that tiles can given real names in the texture manager. 
Use this to turn Duke's and RR's tile enums into real names, leaving out RRTILExx - the few that are needed were renamed.
 2020-10-06 19:26:22 +02:00
Christoph Oelckers
3dbb8cbb11 - safety commit 2020-10-05 21:47:53 +02:00
Christoph Oelckers
29a4955f79 - missing global variables. 2020-10-05 20:44:30 +02:00
Christoph Oelckers
4d712cd5a0 - date code from GZDoom. 2020-10-05 20:28:19 +02:00
Christoph Oelckers
c03644ea76 - base.zs cleanup and extendable structs. 2020-10-05 20:03:28 +02:00
Christoph Oelckers
53980787b6 - added global offset for 2D drawer. 
This is needed to handle Duke's scrolling menus transparently to the menu code.
 2020-10-05 01:42:47 +02:00
Christoph Oelckers
9606b09ddd - update of language code from GZDoom. 2020-10-05 00:46:24 +02:00
Christoph Oelckers
7c89db69bd -menuCustomizer from GZDoom. 2020-10-05 00:23:30 +02:00
Christoph Oelckers
16431e9f0a - SetupMenuColors restored. 2020-10-04 22:21:11 +02:00
Christoph Oelckers
6a4b72cfef - removed obsolete calls from menudef.cpp. 2020-10-04 22:14:20 +02:00
Christoph Oelckers
27ff78ed51 - removed the GZDoom menu CCMDs. 2020-10-04 22:02:10 +02:00
Christoph Oelckers
f233345ba1 - move most of the menu code into the backend. 2020-10-04 21:57:35 +02:00
Christoph Oelckers
7f6b02c451 - merged string table and system callbacks. 2020-10-04 21:15:51 +02:00
Christoph Oelckers
5d76cbcbdb - game compiles and starts again (without menu, of course) 
Now it's time to rebuild the menu.
 2020-10-04 20:53:37 +02:00
Christoph Oelckers
9cc318da93 - ugh 2020-10-04 20:14:15 +02:00
Christoph Oelckers
7be2d44108 - corrected includes. 2020-10-04 20:11:03 +02:00
Christoph Oelckers
82612a1330 - it compiles again (with lots of code commented out.) 2020-10-04 20:11:02 +02:00
Christoph Oelckers
46a1fe3826 - updated script definitions to silcence startup warnings. 2020-10-04 20:10:13 +02:00
Christoph Oelckers
dff8339ba3 - backend update from GZDoom. 2020-10-04 19:33:50 +02:00
Christoph Oelckers
f8caf88089 - backend update. 2020-10-03 17:04:45 +02:00
Christoph Oelckers
fe61ff09a4 - added remapping for Cyrillic characters to matching Latin counterparts. 2020-09-29 20:16:31 +02:00
Christoph Oelckers
b57e13ff62 - mouse code update. 
May still need some tweaking of the factors.
 2020-09-28 22:36:43 +02:00
Christoph Oelckers
012bccd916 - indexed rendering fixes 
backported from GZDoom.
 2020-09-28 21:26:21 +02:00
alexey.lysiuk
6cf921dbfe - restored old mouse scaling for Cocoa backend 
This reverts commit df2b3b6b17.
 2020-09-28 09:35:36 +03:00
Christoph Oelckers
9dd26c8196 - fixed explosion distance of Hexen Cleric's firestorm weapon. 2020-09-27 16:30:06 +02:00
Christoph Oelckers
02afa90202 - another backend update from merging several GZDoom PRs. 2020-09-27 16:16:53 +02:00
Christoph Oelckers
c326bcd308 - fixed i_net's GetPlayerName function's indexing. 2020-09-27 16:12:51 +02:00
Christoph Oelckers
af5e3dd1b8 - render backend update from GZDoom, mostly minor stuff. 2020-09-27 16:12:51 +02:00
Christoph Oelckers
4ca5bfdd46 - sanity check added for MoveLumpsInFolder 2020-09-27 16:12:51 +02:00
Christoph Oelckers
ba5da8ebc2 - UE1 model code update. 2020-09-27 16:12:51 +02:00
Christoph Oelckers
cb49bcb96d - updated VM from GZDoom. 
Just to be up to date.
 2020-09-27 16:12:50 +02:00
Christoph Oelckers
0314cdec55 - texture manager fixes from GZDoom 
* missing null check in FPngTexture.
* ignore identity translations when creating textures.
 2020-09-27 16:12:50 +02:00
Christoph Oelckers
f8ae35f8a5 - macOS backend update, plus moving base64.cpp around. 2020-09-27 16:12:50 +02:00
Christoph Oelckers
0795c79a3a - engine updates from GZDoom. 2020-09-27 16:12:50 +02:00
Christoph Oelckers
a9ca6c8081 - sound backend update from GZDoom. 2020-09-27 16:12:49 +02:00
Christoph Oelckers
03a0cf943e -minor cleanup and backporting of con_pulsetext from Raze. 2020-09-27 16:12:49 +02:00
Christoph Oelckers
9285d91918 - added timescale support from GZDoom. 2020-09-27 16:12:49 +02:00
Christoph Oelckers
f0678f4f4e - Font setup fix from GZDoom. 2020-09-27 07:33:43 +02:00
Christoph Oelckers
b93a9b478a - implemented World Tour's developer commentaries. 2020-09-26 17:43:34 +02:00
Christoph Oelckers
3210dd5782 - fixed the noisiest value truncation warnings after shortly re-enabling them in the compiler, plus a few places where the warning pointed to incorrect code. 2020-09-26 11:59:24 +02:00
Christoph Oelckers
1e12bca0a6 - route World Tour's texts through the string table by adding an indirection option 
This way they can be translated into all languages without duplicating all relevant content.
The original text files are no longer being used.
 2020-09-26 10:08:48 +02:00
Christoph Oelckers
18ce5bed60 - add line feed after PALETTE_EMULATION #define 2020-09-26 08:52:11 +02:00
Christoph Oelckers
8450369a22 - must reset file pointer before reading the size from a patch texture. 2020-09-26 08:42:40 +02:00
Christoph Oelckers
77841b3154 - fixed application of detail textures. 2020-09-25 22:03:11 +02:00
Christoph Oelckers
ccfd20e074 - added some quick rejection checks for Doom patch textures. 
Since the checker reads all lumps completely into memory to check them, this can take quite a while. Reject everything that can be just by looking at the size fields immediately, without loading the rest.
 2020-09-25 19:06:19 +02:00
Christoph Oelckers
a27211dc34 - added support for SSI containers to the file system. 2020-09-19 10:07:53 +02:00
Christoph Oelckers
6776508239 - widescreen asset setup and consolidation of .def file loading. 2020-09-16 19:13:06 +02:00
Christoph Oelckers
b26a5b800e - make sure that changing the texture filter mode does not clobber the global state 
Need to rebind the samplers after modifying them to avoid undefined behavior.

Fixes #397
 2020-09-15 22:00:15 +02:00
Christoph Oelckers
c98f7d304b - added a list compare function to FScanner. 2020-09-15 21:21:16 +02:00
Christoph Oelckers
09a6534270 - redid scriptfile as a wrapper around FScanner 
Another piece of Build licensed code gone, yay!
This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
 2020-09-15 00:11:08 +02:00
Christoph Oelckers
c61a2c3486 - enable palette emulation for HUD weapon drawing. 
Not correct yet but the basics are in.
 2020-09-13 23:14:44 +02:00
Christoph Oelckers
1368c26d22 - fixed translation setup for palette mode. 2020-09-13 21:23:38 +02:00
Christoph Oelckers
6ad8046b47 - dual license d_net.cpp and i_net.cpp 
The same source was available under both in GZDoom, so keep it.
 2020-09-13 19:38:31 +02:00
Christoph Oelckers
57a9419f8e - use FString for returning strings from the script parser. 
This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable.
This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
 2020-09-13 10:29:57 +02:00
Christoph Oelckers
9e81fa89a8 - fixed some of the issues with palette emulation 
* the palette shader was not bound.
* the palette textures were not bound.
* palette mode still used regular lighting on top of the palette emulation

This works a lot better than before but is still not complete.
 2020-09-12 21:23:14 +02:00
Christoph Oelckers
89316aea33 - demoted the SWCustom parser to the primitive Hexen interface after finding out that this is all the Build parser can do. 
This also meant I had to add symbol support to the old style number parsers.
 2020-09-12 10:23:47 +02:00
Christoph Oelckers
e5cf57917e - FScanner::SkipToEndOfBlock 2020-09-11 00:18:13 +02:00
Christoph Oelckers
ef5ac2319e - migrated SW's info script parser to sc_man. 2020-09-10 17:46:54 +02:00