Nikolay
14eb0cd286
fixed parenthesis
2020-12-06 15:27:42 +03:00
Nikolay
efb28b888d
fixed ANCHOR_BOAT
2020-12-05 22:26:45 +03:00
aap
28a942735c
fix pMemoryTop
2020-12-05 14:50:54 +01:00
Nikolay Korolev
a82188ac07
lil fix
2020-12-05 12:12:56 +03:00
Nikolay Korolev
0bd373cd56
script from other platforms and unused commands
2020-12-05 02:49:32 +03:00
aap
466eee84e7
typo
2020-12-04 10:23:04 +01:00
aap
9714a37769
bit more GTA_VERSION and GTA_PS2
2020-12-04 01:12:58 +01:00
aap
43fb7fe342
one more original name
2020-12-03 19:11:57 +01:00
aap
5bed7afd79
forgot some junk
2020-12-03 16:56:32 +01:00
aap
a6c4d9b77c
forgot to wrap in FIX_BUGS
2020-12-03 16:07:16 +01:00
aap
955698d2d3
kludge to prevent dodo unique jumps
2020-12-03 16:05:28 +01:00
aap
13cefd3293
more PS2 stuff; memory movement done
2020-12-03 16:04:59 +01:00
aap
0d166081ad
animviewer fixes
2020-12-03 11:30:46 +01:00
aap
3c24505990
little fixes for animviewer
2020-12-03 09:34:09 +01:00
erorcun
ab3e810a95
AnimViewer done, comment cleanup
2020-12-03 05:22:58 +03:00
erorcun
8b47774aee
Stats page
2020-12-03 02:09:35 +03:00
aap
448ba9b7e8
bla
2020-12-02 13:08:30 +01:00
aap
50bf0f27a0
rpDefaultGeometryInstance
2020-12-02 12:58:29 +01:00
erorcun
774aa1570f
Merge pull request #853 from erorcun/miami
...
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:35:06 +03:00
erorcun
bd8b907d13
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:21:46 +03:00
aap
1172056833
cam lod dist fix
2020-12-02 10:39:23 +01:00
aap
f576311814
Merge branch 'master' of github.com:GTAmodding/re3
2020-12-02 10:38:39 +01:00
aap
fba657ff0c
better cam lod dist fix
2020-12-02 10:38:27 +01:00
Nikolay Korolev
4b9f1680a3
fast fix
2020-12-02 02:41:05 +03:00
Nikolay Korolev
fda58fb1df
added GTA_SCENE_EDIT
2020-12-02 02:34:51 +03:00
Sergeanur
43d5831394
cAudioManager::ProcessPedOneShots + fixes
2020-12-01 23:38:36 +02:00
Sergeanur
a259b6b8ab
TexturePools
...
# Conflicts:
# src/core/Game.cpp
# src/rw/RwHelper.cpp
2020-12-01 22:54:19 +02:00
Sergeanur
24b5406a1d
Add GTA_REPLAY
...
# Conflicts:
# src/control/Replay.cpp
# src/control/Replay.h
2020-12-01 22:53:09 +02:00
Sergeanur
0b20fd7e77
Remove ifndef GTA_PS2 around replays
2020-12-01 22:35:53 +02:00
Sergeanur
9461998304
TexturePools
2020-12-01 22:12:46 +02:00
Sergeanur
e33ab44b7d
Add GTA_REPLAY
2020-12-01 22:08:05 +02:00
aap
83bbb631d1
some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)
2020-12-01 17:42:18 +01:00
aap
b8bc54640d
fix cam-fix
2020-12-01 17:24:56 +01:00
aap
56c471d02e
Merge pull request #854 from Nick007J/master
...
small garages + templates revision
2020-12-01 11:25:02 +01:00
aap
8de7072720
Merge pull request #857 from majesticCoding/miami
...
skimmer shadow
2020-12-01 11:24:24 +01:00
aap
d545246bbf
plane fix
2020-12-01 10:19:11 +01:00
aap
d6fab1bc53
cam stuff
2020-12-01 10:12:42 +01:00
aap
6dcbc8f062
Merge pull request #856 from ZLau92/patch-2
...
Update Camera.cpp - Vehicle spawning on ultrawide aspect ratios
2020-12-01 10:00:58 +01:00
majestic
cd23695116
skimmer shadow
2020-11-30 23:52:35 -08:00
Sergeanur
5a3a058ed3
Make texture conversion work a bit faster
...
# Conflicts:
# src/core/config.h
2020-12-01 03:51:31 +02:00
Sergeanur
16abbad6b2
Add multisampling to librw
...
# Conflicts:
# src/core/config.h
# vendor/librw
2020-12-01 03:42:40 +02:00
withmorten
b8d3d8f5e4
add -console cmdline arg instead of #if 0/1
...
# Conflicts:
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
2020-12-01 03:41:09 +02:00
erorcun
4ec60676e7
Merge pull request #846 from withmorten/ini
...
add -console cmdline arg instead of #if 0/1
2020-12-01 04:21:00 +03:00
Zach Charo
6eb0fd52d7
Update Camera.cpp
...
camdist multiplier is consitently between 1 and 1.4 on 16:9 aspect ratio
On ultrawide, the cam dist multiplier jumps to anywhere between 2 and 3
The preferred distance generator for car objects is the cam dist multiplier * 120. Which puts cars that it's trying to generate outside of the allowed gen/draw distance for new car objects when on ultrawide. This means no new cars can spawn.
This change caps the scaling for the generation distance a bit above what it would be for 16:9 and does not affect the LOD multiplier.
2020-11-30 19:08:15 -06:00
aap
2c59e1c894
some more GTA_VERSION
2020-12-01 00:22:57 +01:00
aap
4b9fb631fc
added a few registered pointers and memory debug
2020-11-30 23:44:58 +01:00
Walied K. Yassen
1dcd7c5b14
Fix the code style issues
2020-11-30 08:36:06 +02:00
Walied K. Yassen
ac7ea2b9fa
Implement the missing damage effects and fix the existing ones
2020-11-30 02:09:35 +02:00
Nikolay Korolev
a3b83a5d2f
Merge remote-tracking branch 'upstream/master'
2020-11-30 02:15:35 +03:00
Nikolay Korolev
8f05ccd6c4
small garages revision + small template stuff
2020-11-30 02:15:03 +03:00
aap
d5bc382cb5
GTA_VERSION define and some config.h cleanup
2020-11-29 21:29:48 +01:00
aap
566282057a
add debug script hotkey
2020-11-29 11:37:06 +01:00
aap
5282696699
fix backface culling on vehicles
2020-11-29 11:36:26 +01:00
Walied K. Yassen
a1ab82b188
Implement MI_BEACHBALL behaviours
2020-11-29 09:14:15 +02:00
Walied K. Yassen
afe70003f4
Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as explosive
2020-11-29 08:53:54 +02:00
Walied K. Yassen
03ef438a72
Fix CObject::DeleteAllTempObjectsInArea not considering the given point
2020-11-29 04:20:28 +02:00
Nikolay Korolev
8cb3c07151
some nasty FIX_BUGS for SLIDE_OBJECT
2020-11-28 21:26:38 +03:00
aap
c57fee38ca
Merge pull request #841 from aap/master
...
start using CMemoryHeap; also some PS2 define cleanup
2020-11-28 18:52:44 +01:00
withmorten
b1a431a740
add -console cmdline arg instead of #if 0/1
2020-11-28 17:57:10 +01:00
aap
a8035b6466
moved some stuff to MemoryMgr
2020-11-28 17:05:57 +01:00
aap
b23bda6e45
Merge branch 'master' of github.com:GTAmodding/re3
2020-11-28 16:02:21 +01:00
Sergeanur
ad48b9cde0
Make texture conversion work a bit faster
2020-11-28 16:29:45 +02:00
Sergeanur
18d0fd2e48
Add multisampling to librw
2020-11-28 15:13:06 +02:00
Zach Charo
b47c505438
Update Script.cpp
...
Case sensitivity fix. Causes compile issue on linux.
2020-11-28 13:36:38 +02:00
Nikolay Korolev
f50a53e290
fix garages
2020-11-27 19:18:51 +03:00
aap
d857758c16
start using CMemoryHeap
2020-11-26 17:39:59 +01:00
Sergeanur
491274f188
CStreaming::PrintStreamingBufferState
2020-11-26 18:11:55 +02:00
aap
4ddc356341
memory heap starting to work
2020-11-25 22:49:50 +01:00
aap
88baa9ce5f
implemented CMemoryHeap, not used or tested yet
2020-11-25 21:34:06 +01:00
Sergeanur
164f16c85b
Some TODOs done in Peds code
2020-11-25 19:39:57 +02:00
Sergeanur
8f5e60f787
Original enum name
2020-11-24 17:16:39 +02:00
aap
70d8bdc087
rename badly named camera variable
2020-11-24 15:20:41 +01:00
aap
1906a08f72
cam fix; forgot some shaders
2020-11-24 15:18:39 +01:00
Sergeanur
a35b3b4602
Script commands split to original files
2020-11-24 14:06:48 +02:00
Sergeanur
bd3d09fef5
Script commands split to original files
2020-11-24 12:58:11 +02:00
erorcun
b7783b19d2
Xbox message screen, disabled by default
2020-11-24 01:45:54 +03:00
Sergeanur
833bf4a619
Add some TODO stubs for unused code to be reversed
2020-11-23 18:59:50 +02:00
aap
b2f9b3175b
two unused functions
2020-11-23 11:06:16 +01:00
aap
b6da31cfaa
two unused functions
2020-11-23 09:38:51 +01:00
aap
9b4cfa618d
Merge pull request #827 from aap/master
...
finished cullzones
2020-11-22 22:49:22 +01:00
Sergeanur
103b8fb426
More audio fix
2020-11-22 23:24:38 +02:00
Sergeanur
3289bfaa87
Darkel done
2020-11-22 23:18:35 +02:00
Sergeanur
87e6edd554
Renderer fix
2020-11-22 23:16:21 +02:00
Nikolay
2b53f267a7
one more fix
...
# Conflicts:
# src/control/Restart.cpp
2020-11-22 23:13:43 +02:00
Nikolay
6a6551f39b
small improvement
...
# Conflicts:
# src/control/Restart.cpp
2020-11-22 23:13:23 +02:00
Sergeanur
c814a0a1a6
Renderer fix
2020-11-22 23:11:55 +02:00
Sergeanur
f010777e58
Audio fixes
2020-11-22 23:10:41 +02:00
Nikolay
222e7f56ff
one more fix
2020-11-22 02:31:52 +03:00
Nikolay
d24e1ee592
small improvement
2020-11-22 02:29:17 +03:00
aap
07303c62d1
finished cullzones
2020-11-22 00:13:07 +01:00
aap
15ae9e2a3e
Merge pull request #823 from aap/master
...
Neo screen droplets
2020-11-22 00:12:34 +01:00
aap
b9b7d5ac21
Merge pull request #825 from aap/miami
...
neo screen droplets
2020-11-22 00:12:31 +01:00
Nikolay
6b6b600cee
no script logging
2020-11-21 21:12:47 +03:00
Sergeanur
fe40f65703
Reorganize CPed functions into their original cpp files
2020-11-20 01:18:37 +02:00
Sergeanur
9e45feb4fa
Reorganize CPed functions into their original cpp files
2020-11-19 21:12:20 +02:00
aap
07fe099b4e
neo screen droplets
2020-11-19 19:07:32 +01:00
aap
02c7f8381b
neo screen droplets
2020-11-19 16:23:52 +01:00
aap
a0a8bb8d92
Merge pull request #822 from aap/master
...
CPed review part1,2 re3
2020-11-19 15:20:53 +01:00
erorcun
808f7c46f1
Infamous XBOX subtitle outline
2020-11-19 02:09:04 +03:00
erorcun
54214dd2c4
Fix mouse lock/high-dpi
2020-11-18 17:42:21 +03:00
Greg V
2ce9e540da
Use CLOCK_MONOTONIC_FAST when available (FreeBSD)
...
CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
2020-11-18 17:13:03 +03:00
Greg V
1544acff05
Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction)
...
On Wayland, clients cannot move the mouse pointer.
Mouse constraints, as required for 3D camera movement, are an explicit specific thing,
and glfw supports it with GLFW_CURSOR_DISABLED.
Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
2020-11-18 17:10:56 +03:00
Greg V
7c1497a058
glfw: scale cursor position by the ratio of framebuffer to screen size
...
This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
2020-11-18 17:10:49 +03:00
Greg V
d05c50ea74
Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallback
...
Framebuffer size is scaled by the display scale.
This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups.
Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
2020-11-18 17:09:10 +03:00
aap
91f9c7938e
CPed review part1,2 re3
2020-11-18 12:38:47 +01:00
aap
9826fdf6d5
more fixes to librw stuff
2020-11-18 11:16:02 +01:00
aap
acb29e0dad
more fixes to librw stuff
2020-11-18 11:15:27 +01:00
aap
8c70c2a136
changes to librw layer, GLES now runtime choice
2020-11-18 10:32:18 +01:00
aap
82b0103c67
changes to librw layer, GLES now runtime choice
2020-11-18 10:27:55 +01:00
aap
448c56647f
Merge pull request #821 from aap/miami
...
CPed review part2
2020-11-18 10:04:12 +01:00
erorcun
1d600c640a
Merge pull request #816 from erorcun/miami
...
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 01:45:28 +03:00
erorcun
b58a54527e
Merge pull request #820 from withmorten/mission-switcher
...
add mission switcher from miami
2020-11-18 01:45:12 +03:00
erorcun
c6f53d25b0
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 00:33:45 +03:00
aap
19d9430314
fix flag
2020-11-16 22:57:37 +01:00
aap
46253fbf7d
Merge branch 'master' of github.com:GTAmodding/re3
2020-11-16 22:43:35 +01:00
aap
3564b85b4e
animation compression from PS2
2020-11-16 22:43:15 +01:00
Sergeanur
e71da86a5c
pragma twice
2020-11-16 15:05:29 +02:00
Sergeanur
a802ad5c27
pragma twice
2020-11-16 15:05:02 +02:00
Sergeanur
6bc2ed74fe
Add debug code to CPathFind::PreparePathDataForType
2020-11-16 14:56:07 +02:00
erorcun
f33ed2892a
Fix mouse lock/high-dpi 2
2020-11-16 15:49:00 +03:00
erorcun
3b1debaa0d
Fix mouse lock/high-dpi
2020-11-16 15:28:10 +03:00
erorcun
72c0a6a680
Merge pull request #723 from myfreeweb/master
...
Fixes for Wayland (HiDPI and mouse lock) support, FreeBSD
2020-11-16 15:20:20 +03:00
Nikolay
b508458f37
small fix
2020-11-16 15:13:30 +03:00
Sergeanur
cdd30f4da5
Move ColStore to collision
2020-11-16 12:49:23 +02:00
Nikolay Korolev
15b7126243
small fix of fix
2020-11-16 12:28:20 +03:00
Nikolay Korolev
0ac621588e
small fix
2020-11-16 12:22:55 +03:00
aap
b82b79fa11
CPed review part2; and reverting some stylistic changes
2020-11-16 09:57:33 +01:00
aap
acdf602505
change gl caps.dat constants
2020-11-16 09:48:38 +01:00
aap
6804ad62c6
little fix to ps2 CPad
2020-11-16 09:48:15 +01:00
aap
5335b46cbb
little fix to ps2 CPad
2020-11-16 09:48:02 +01:00
aap
8a8f2d4e5b
Merge pull request #815 from aap/miami
...
CPed review part 1
2020-11-16 09:45:47 +01:00
aap
2f9a905c61
change gl caps.dat constants
2020-11-16 09:41:39 +01:00
withmorten
abcda2ce29
add mission switcher from miami
2020-11-16 00:41:03 +01:00
withmorten
207f8576d8
move config.h define to CUSTOM_FRONTEND_OPTIONS
2020-11-16 00:21:04 +01:00
withmorten
f0071c094a
remove unneeded ifdef
2020-11-16 00:07:27 +01:00
Sergeanur
9bb8ebaa10
Make collision code placement more like original (+ small fixes)
...
# Conflicts:
# premake5.lua
# src/CMakeLists.txt
# src/collision/Collision.cpp
# src/core/Collision.h
2020-11-16 00:36:54 +02:00
withmorten
ac29ae6e23
add CFO for invertlook4pad; update american.gxt
2020-11-15 23:06:29 +01:00
withmorten
0669df763c
Merge branch 'upstream/master'
2020-11-15 22:08:40 +01:00
withmorten
ad10d3e64e
revert frontend changes for invertlook4pad
2020-11-15 22:07:44 +01:00
Sergeanur
a6f5f4634c
Make collision code placement more like original (+ small fixes)
2020-11-15 19:51:35 +02:00
Sergeanur
be205d9602
Merge pull request #797 from theR4K/master
...
Make code in master same like in audio PR for miami
2020-11-15 14:55:40 +02:00
Nikolay Korolev
26c6908d25
car AI revision
2020-11-14 14:21:56 +03:00
Sergeanur
8374a346e5
Fix loading island LODs with big buildings
2020-11-13 18:28:15 +02:00
Nikolay Korolev
6682e56f71
small fix
2020-11-13 17:53:03 +03:00
Nikolay Korolev
3048a77a05
fix
2020-11-13 16:02:06 +03:00
aap
257f45c3c3
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-13 13:14:56 +01:00
aap
8ab0d25b4a
CPed review, part 1
2020-11-13 13:14:22 +01:00
Nikolay Korolev
a3f24d1bbf
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-13 13:20:07 +03:00
Nikolay Korolev
2e915780aa
some fixes
2020-11-13 13:19:54 +03:00
aap
3d46f2a3af
fixed bike collision damage
2020-11-12 20:05:02 +01:00
erorcun
4f8029ad7c
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-11-12 17:37:04 +03:00
erorcun
b67ed1988f
Peds: Remove redundant lines
2020-11-12 17:36:41 +03:00
Nikolay Korolev
55c9a81922
fixed zone bug
2020-11-12 17:32:16 +03:00
aap
90b624a3e0
Merge pull request #812 from Nick007J/miami
...
CWorld done + top gear fix
2020-11-12 11:40:19 +01:00
Sergeanur
feeab0b74a
Fix ini reader
2020-11-11 20:57:44 +02:00
aap
0115b0827b
fix wrong blend mode (original bug)
2020-11-11 19:10:22 +01:00
aap
79432dce20
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-11 14:42:12 +01:00
aap
ff44f29616
ped fix for new renderer
2020-11-11 14:42:02 +01:00
Nikolay
a76c6b2307
damn
2020-11-11 13:40:11 +03:00
Nikolay
984708dfd3
damn
2020-11-11 13:36:10 +03:00
Nikolay
a8b5303207
Update src/control/Pickups.cpp
...
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
2020-11-11 13:19:21 +03:00
erorcun
67e57d1368
Fix RestoreDef crash
2020-11-11 13:08:22 +03:00
Nikolay Korolev
35874b5fd2
fix
2020-11-11 12:27:40 +03:00
Nikolay Korolev
a67d4c70d7
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 12:22:57 +03:00
Nikolay Korolev
be92957328
fixed top gear
2020-11-11 12:21:30 +03:00
aap
546ed0ff07
changes to RW layer so loading foreign files works
2020-11-11 09:42:30 +01:00
aap
48d0653331
urgh, merge and changes to RW layer in one commit.
2020-11-11 09:38:33 +01:00
Nikolay Korolev
612a6dd06c
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 00:08:54 +03:00
Nikolay Korolev
ef2089cafb
CWorld done
2020-11-11 00:08:32 +03:00
Sergeanur
5c64dba65a
Merge pull request #771 from theR4K/miamiDev
...
more audio for god of audio
2020-11-10 22:32:12 +02:00
erorcun
460f3cea44
Frontend: Scroll for All, some care for PS2-like menu
...
Don't show Back button on PS2-like menu
Removed PS2-style reversed fade-in, because it was a hack and taking too much space
2020-11-10 02:07:02 +03:00
erorcun
59f9c009ef
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-10 01:50:34 +03:00
majestic
cf6a9a8341
CGlass indices fix
2020-11-09 06:18:49 -08:00
Sergeanur
51e7f44433
Pickup fix
2020-11-08 22:40:05 +02:00
Roman Masanin
c91d5a90a1
easy way to safe few petaseconds
2020-11-08 23:29:57 +03:00
Sergeanur
23d294fef5
Possibly fix pickup money text
2020-11-08 21:59:13 +02:00
Roman Masanin
fb2173c396
to make Serge and _R4K_ happy
2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098
marked stupied code(dotProduct and AudioEvents)
2020-11-08 22:26:14 +03:00
Roman Masanin
612bd98039
return bad code, becouse no one knows what to do with it
2020-11-08 21:30:03 +03:00
Roman Masanin
0853a47a3f
returned bad code, becouse no one knows what to do with it
2020-11-08 21:23:29 +03:00
erorcun
f8367ebdef
Revert "Font: Fix text dimensions"
...
This reverts commit 6729de49b1
.
2020-11-08 21:11:55 +03:00
Roman Masanin
279acfae59
pointers to referencies too
2020-11-08 20:50:46 +03:00
erorcun
fe5d0c9cdf
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-08 20:49:47 +03:00
Roman Masanin
e269809bfd
Merge branch 'master' of https://github.com/GTAmodding/re3
2020-11-08 20:32:31 +03:00
Roman Masanin
95bd5b073a
pointers into referencies!
2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716
fix for merge fix
2020-11-08 17:49:10 +03:00
Roman Masanin
f8cc86c227
fix merge
2020-11-08 16:23:20 +03:00
Roman Masanin
23d23f6462
merge upstream
2020-11-08 16:23:05 +03:00
Sergeanur
a2e0373d22
Pickups fix
2020-11-08 15:00:54 +02:00
erorcun
c96ffb05b1
Merge pull request #809 from erorcun/master
...
Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults
2020-11-07 23:51:07 +03:00
erorcun
163c12608f
Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults
2020-11-07 21:58:23 +03:00
Sergeanur
7f4498e0f0
Check if buttons txd exsist
2020-11-07 20:54:38 +02:00
Sergeanur
7ede8685ec
Ped comments fixes
2020-11-07 14:39:53 +02:00
Sergeanur
3b81eaa2d7
Fix cAudioManager::GetPhrase
2020-11-07 13:55:55 +02:00
aap
092f32ba67
move stuff into define
2020-11-07 12:52:11 +01:00
Filip Gawin
e24513d2ad
Sfx audio logic
2020-11-06 18:42:52 +01:00
Filip Gawin
f442793d20
Allow to handle larger files via 64bit variables
2020-11-06 18:42:28 +01:00
withmorten
bd78b5ff4e
add bInvertLook4Pad from VC (doesn't get saved yet)
2020-11-05 19:57:13 +01:00
aap
ee8366adba
RwRenderStateGet
2020-11-05 17:46:28 +02:00
aap
8614f68620
RwRenderStateGet
2020-11-05 16:42:57 +01:00